luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改灌溉记录bug,添加充值报文处理

Browse Source
This commit is contained in:
mi9688 2025-01-07 12:56:40 +08:00
parent a9dde2c96b
commit 8d6f5216d5
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
View File

@ -412,7 +412,18 @@ public class DeviceOtherMsgConsumer {
if(data1.getStr("action")!=null&& "askMsg".equals(data1.getStr("action"))){ if(data1.getStr("action")!=null&& "askMsg".equals(data1.getStr("action"))){
cardReportHandler(productId,serialNumber,jsonObject); cardReportHandler(productId,serialNumber,jsonObject);
} }
//充值成功处理的报文
else if (data1.getStr("action")!=null&& "investMsg".equals(data1.getStr("action"))){
//获取订单号并更新订单状态
Long orderNum = data1.getLong("orderNum");
boolean update = new LambdaUpdateChainWrapper<>(ngUserRechargeRecordsMapper)
.set(NgUserRechargeRecords::getStatus, 3)//已充值
.eq(NgUserRechargeRecords::getId, orderNum)
.update();
if(!update){
log.error("设备{}修改订单号为：{}的订单状态为已充值失败",serialNumber,orderNum);
}
}
} }
else if (topic.endsWith("/info/reply")) { else if (topic.endsWith("/info/reply")) {
@ -565,6 +576,15 @@ public class DeviceOtherMsgConsumer {
for(int i=0;i<=orderList.size()-1;i++){ for(int i=0;i<=orderList.size()-1;i++){
//累加金额 //累加金额
investBalance=investBalance+orderList.get(i).getAmount().doubleValue(); investBalance=investBalance+orderList.get(i).getAmount().doubleValue();
//被合并的订单状态修改为已充值
if(i<orderList.size()-1){
boolean update = new LambdaUpdateChainWrapper<>(ngUserRechargeRecordsMapper)
.set(NgUserRechargeRecords::getStatus, 3)
.update();
if(!update){
log.error("设备{}更新被合并的订单{}状态为已充值失败",serialNumber,orderList.get(i).getId());
}
}
} }
//取最新的订单号作为合并后的订单 //取最新的订单号作为合并后的订单
dataValue.put("orderNum",orderList.get(orderList.size()-1).getId());//订单号 dataValue.put("orderNum",orderList.get(orderList.size()-1).getId());//订单号

12
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java
View File

@ -182,10 +182,14 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName(); temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
} }
if(list.get(i).getDeviceNumber()!=null) if (list.get(i).getDeviceNumber() != null) {
{ String deviceNumber = list.get(i).getDeviceNumber();
temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName(); String controllerName = "";
NgIrrigationControllers ngIrrigationControllers = ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(deviceNumber);
if (ngIrrigationControllers != null) {
controllerName = ngIrrigationControllers.getControllerName();
}
temp.deviceName = (controllerName != null) ? controllerName : "";
} }
temp.deviceNumber=list.get(i).getDeviceNumber(); temp.deviceNumber=list.get(i).getDeviceNumber();
temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber(); temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber();