diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java index 7058554c..9b5b2c04 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java @@ -136,7 +136,7 @@ public class QueryStopChargeController { //设置推送停止充电订单所需要的数据 Map pushOrder = REDIS.getCacheMap("pushOrder:".concat(xhOrderNo)); - pushOrder.put("stopCommandSent", true); + pushOrder.put("stopCommandSent", false); pushOrder.put("operatorId3rdpty", startChargeSeq.substring(0, 9)); pushOrder.put("internetSerialNumber", startChargeSeq); REDIS.setCacheMap("pushOrder:".concat(xhOrderNo), pushOrder); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CheckChargeOrders.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CheckChargeOrders.java index b88c79a4..f21b9e2c 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CheckChargeOrders.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CheckChargeOrders.java @@ -47,7 +47,7 @@ public class CheckChargeOrders extends CoreDispatcher { for (String pushOrderKey : pushOrders) { Map pushOrder = REDIS.getCacheMap(pushOrderKey); Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent"); - if (stopCommandSent == null) { + if (stopCommandSent == null || !stopCommandSent) { continue; } String orderNo = pushOrderKey.substring(10); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo.java index 0552c3de..e3c2192c 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo.java @@ -53,7 +53,7 @@ public class NotificationChargeOrderInfo extends CoreDispatcher { for (String pushOrderKey : pushOrders) { Map pushOrder = REDIS.getCacheMap(pushOrderKey); Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent"); - if (stopCommandSent == null) { + if (stopCommandSent == null || !stopCommandSent) { continue; } String orderNo = pushOrderKey.substring(10); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java index 93f62cab..07060c88 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java @@ -80,7 +80,7 @@ public class NotificationStopChargeResultTask extends CoreDispatcher { //推送成功则排除这个已推送的订单,否则则继续推送该订单 //将stopCommandSent置为null,表示推送成功之后该订单都不进行推送 if (succStat == 0) { - pushOrder.replace("stopCommandSent", null); + pushOrder.replace("stopCommandSent", true); REDIS.setCacheMap(pushOrderKey, pushOrder); } }