autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 查询订单详情页时，检查订单状态

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-10-10 13:29:58 +08:00
parent 33bc29258b
commit 32ab518ca1
9 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -379,7 +379,7 @@ public class OrderService {
// 监控信息
OrderDetailInfoVO.OrderRealTimeInfo realTimeInfo = new OrderDetailInfoVO.OrderRealTimeInfo();
RealTimeMonitorData realTimeMonitorData = chargingRealTimeDataList.get(0);
RealTimeMonitorData realTimeMonitorData = chargingRealTimeDataList.get(0); // 最后一次实时数据
realTimeInfo.setOrderAmount(realTimeMonitorData.getChargingAmount());
realTimeInfo.setChargedDegree(realTimeMonitorData.getChargingDegree());
realTimeInfo.setChargingTime(realTimeMonitorData.getSumChargingTime());
@@ -393,7 +393,7 @@ public class OrderService {
vo.setRealTimeMonitorDataList(infoList);
// 最后一次实时数据
vo.setLastMonitorData(chargingRealTimeDataList.get(0));
vo.setLastMonitorData(realTimeMonitorData);
}
// 支付流水
@@ -429,7 +429,20 @@ public class OrderService {
log.error("后管查询订单详情时把redis中的实时数据存到表发生异常", e);
}
// 校验
try {
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
RealTimeMonitorData lastMonitorData = vo.getLastMonitorData();
if (lastMonitorData != null) {
String dateTime = lastMonitorData.getDateTime();
if (DateUtils.intervalTime(dateTime, DateUtils.getDateTime()) > 2L) {
// 间隔时间超过2分钟, 订单状态修改为异常
}
}
}
} catch (Exception e) {
log.error("后管查询订单详情时校验订单状态", e);
}
return vo;
}