EMPT / location · 提交

转到一个项目

作者 shenhailong
提交 bf7413990be70513ffc2f2328ef737f88478c94c 1 个父辈 c67fe612

修改订单生成规则

内嵌 并排对比
正在显示 10 个修改的文件 包含 132 行增加 和 13 行删除
... ... @@ -48,8 +48,9 @@ public class PayOrderController {
@RequestParam(value = "orderNumber", required = false) String orderNumber,
@RequestParam(value = "payTime", required = false) String payTime,
@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "payType", required = false) String payType) {
PageInfo<PayRecords> order = payOrderService.getOrder(pageSize, pageNum, orderNumber, payTime, username, payType);
@RequestParam(value = "payType", required = false) String payType,
@RequestParam(value = "paystatus", required = false) String paystatus) {
PageInfo<PayRecords> order = payOrderService.getOrder(pageSize, pageNum, orderNumber, payTime, username, payType, paystatus);
return order;
}
... ...
package com.sunyo.energy.location.dao;
import com.sunyo.energy.location.model.ElectrifyInfo;
public interface ElectrifyInfoMapper {
int deleteByPrimaryKey(Integer id);
int insert(ElectrifyInfo record);
int insertSelective(ElectrifyInfo record);
ElectrifyInfo selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(ElectrifyInfo record);
int updateByPrimaryKey(ElectrifyInfo record);
}
\ No newline at end of file
... ...
... ... @@ -22,7 +22,8 @@ public interface PayRecordsMapper {
@Param(value = "startTime") String startTime,
@Param(value = "endTime") String endTime,
@Param(value = "username") String username,
@Param(value = "payType") String payType);
@Param(value = "payType") String payType,
@Param(value = "paystatus") String paystatus);
String findOrderNumber(String orderId);
... ...
package com.sunyo.energy.location.model;
public class ElectrifyInfo {
private Integer id;
private String deviceid;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getDeviceid() {
return deviceid;
}
public void setDeviceid(String deviceid) {
this.deviceid = deviceid == null ? null : deviceid.trim();
}
}
\ No newline at end of file
... ...
... ... @@ -7,7 +7,8 @@ import com.sunyo.energy.location.model.PayRecords;
* Created by XYH on 2019/12/16.
*/
public interface PayOrderService {
PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime, String username, String payType);
PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime,
String username, String payType, String paystatus);
int addOrder(PayRecords payRecords);
... ...
... ... @@ -34,6 +34,9 @@ public class ElectricityMeterServiceImp implements ElectricityMeterService {
@Autowired
USERSMapper usersMapper;
@Autowired
ElectrifyInfoMapper electrifyInfoMapper;
/**
* 获取电表实时数据/余额
... ... @@ -113,10 +116,24 @@ public class ElectricityMeterServiceImp implements ElectricityMeterService {
if (energyInfoForRealTime.getBalance() != null){
int i = energyInfoForRealTime.getBalance().compareTo(BigDecimal.ZERO);
if (i > 0){
/**
* 通知送电
*/
Map<String, Object> map = new HashMap<>();
map.put("deviceId", deviceId);
map.put("action", "1");
HttpsUtils.sendPost(remoteControlDevices, map);
String postResult = HttpsUtils.sendPost(remoteControlDevices, map);
RechargeDevicesResult rechargeDevicesResult1 = JSON.parseObject(postResult, RechargeDevicesResult.class);
if ("0".equals(rechargeDevicesResult1.getErrcode())){
// 成功不处理
log.info("送电成功------------------------");
}else {
// 失败插入临时表
ElectrifyInfo electrifyInfo = new ElectrifyInfo();
electrifyInfo.setDeviceid(deviceId);
electrifyInfoMapper.insertSelective(electrifyInfo);
log.info("送电失败插入临时表-----------------------------");
}
}
}
return 1;
... ...
... ... @@ -23,7 +23,8 @@ public class PayOrderImpl implements PayOrderService {
@Override
public PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime, String username, String payType) {
public PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime,
String username, String payType, String paystatus) {
// 开始时间
String startTime = "";
... ... @@ -40,9 +41,9 @@ public class PayOrderImpl implements PayOrderService {
List<PayRecords> list = new ArrayList<>();
if ("admin".equals(username)) {
username = "";
list = recordsMapper.findAll(orderNumber, startTime, endTime, username, payType);
list = recordsMapper.findAll(orderNumber, startTime, endTime, username, payType, paystatus);
} else {
list = recordsMapper.findAll(orderNumber, startTime, endTime, username, payType);
list = recordsMapper.findAll(orderNumber, startTime, endTime, username, payType, paystatus);
}
... ...
... ... @@ -21,10 +21,7 @@ import org.springframework.stereotype.Service;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service
... ... @@ -282,7 +279,7 @@ public class WaterMeterServiceImp implements WaterMeterService {
public PayRecords payRecords(String payFees, String wmId, String userId, String realName, String eeId) {
PayRecords payRecords = new PayRecords();
payRecords.setOrdernumber(AllUtils.getOrderIdByTime());
payRecords.setOrdernumber(UUID.randomUUID().toString());
payRecords.setPayfees(new BigDecimal(payFees));
payRecords.setPaystatus(false);
if (!"".equals(wmId)) {
... ...
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.sunyo.energy.location.dao.ElectrifyInfoMapper" >
<resultMap id="BaseResultMap" type="com.sunyo.energy.location.model.ElectrifyInfo" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="deviceId" property="deviceid" jdbcType="VARCHAR" />
</resultMap>
<sql id="Base_Column_List" >
id, deviceId
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
<include refid="Base_Column_List" />
from electrify_info
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
delete from electrify_info
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.sunyo.energy.location.model.ElectrifyInfo" >
insert into electrify_info (id, deviceId)
values (#{id,jdbcType=INTEGER}, #{deviceid,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.sunyo.energy.location.model.ElectrifyInfo" >
insert into electrify_info
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="deviceid != null" >
deviceId,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=INTEGER},
</if>
<if test="deviceid != null" >
#{deviceid,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.sunyo.energy.location.model.ElectrifyInfo" >
update electrify_info
<set >
<if test="deviceid != null" >
deviceId = #{deviceid,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.sunyo.energy.location.model.ElectrifyInfo" >
update electrify_info
set deviceId = #{deviceid,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
... ...
... ... @@ -50,6 +50,9 @@
<if test="payType != '' and payType != null">
and payType = #{payType, jdbcType=BIT}
</if>
<if test="paystatus != '' and paystatus != null">
and payStatus = #{paystatus, jdbcType=BIT}
</if>
order by payTime desc
</select>
... ...