diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java index 1d29e5638..f4e1ef94c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java @@ -254,13 +254,18 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { // 03表示充电中 if (StringUtils.equals(connectorStatus, "03")) { - // 充电时保存实时数据到redis - pileBasicInfoService.saveRealTimeMonitorData2Redis(realTimeMonitorData); + // 默认保存到redis + boolean saveRedisFlag = true; // 查询数据库中该订单当前信息 - // OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(transactionCode); OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); if (Objects.nonNull(orderInfo)) { + if (StringUtils.equals(orderInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue()) + || StringUtils.equals(orderInfo.getOrderStatus(), OrderStatusEnum.STAY_SETTLEMENT.getValue())) { + // 在订单状态为 订单完成或待结算,不保存 + saveRedisFlag = false; + } + boolean updateFlag = false; if (StringUtils.equals(orderInfo.getOrderStatus(), OrderStatusEnum.NOT_START.getValue()) || StringUtils.equals(orderInfo.getOrderStatus(), OrderStatusEnum.ABNORMAL.getValue()) @@ -280,6 +285,11 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { orderBasicInfoService.updateOrderBasicInfo(orderInfo); } } + + // 充电时保存实时数据到redis + if (saveRedisFlag) { + pileBasicInfoService.saveRealTimeMonitorData2Redis(realTimeMonitorData); + } } // 异步推送第三方平台实时数据