From ff2f2eee4a2af3f2d3a16251c3ea30902d14fccd Mon Sep 17 00:00:00 2001
From: zz <Admin123>
Date: Wed, 6 Apr 2022 16:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=90=AF=E5=8A=A8=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xhpc/pp/logic/OrderDataLogic.java  | 2 +-
 .../com/xhpc/pp/logic/RemoteStartReplyDataLogic.java     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java
index 9f6e44dc..9fb6bc73 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java
@@ -73,7 +73,7 @@ public class OrderDataLogic implements ServiceLogic {
         final R r = pileOrderService.pileEndOrder(orderNo);
         if (orderNo.equals("00000000000000000000000000000000") || (r != null && r.getMsg() != null && r.getMsg().contains(
                 "无效订单"))) {
-            log.error(">>INVALID order [{}] detected. MUST check the system.<<", orderNo);
+            log.error(">>INVALID order [{}] detected. MUST check the system or [{}].<<", orderNo, gunkey);
         }
         String resultStr = "6815".concat(req.get("seqhex").toString()).concat("0040").concat(orderNo);
         if (r != null && r.getCode() == 200) {
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java
index 7f440a6e..e1dc9f29 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java
@@ -43,7 +43,6 @@ public class RemoteStartReplyDataLogic implements ServiceLogic {
 
     @Override
     public ServiceResult service(ServiceParameter sp) throws Exception {
-
         Map<String, Object> req = sp.getParameters();
         ObjectMapper objectMapper = new ObjectMapper();
         RemoteStartReplyData remoteStartReplyData = objectMapper.convertValue(req, RemoteStartReplyData.class);
@@ -69,12 +68,20 @@ public class RemoteStartReplyDataLogic implements ServiceLogic {
             pileOrderService.pileStartup(orderNo, 1, "启动充电成功");
             if (pushOrder != null) {
                 REDIS.setCacheMapValue(pushOrderKey, "startChargeSeqStat", 2);
+            }  else {
+                Map map = new HashMap<>();
+                map.put("startChargeSeqStat", Integer.valueOf(2));
+                REDIS.setCacheMap(pushOrderKey, map);
             }
         } else {
             final String remark = frs.get(remoteStartReplyData.getFailReason());
             pileOrderService.pileStartup(orderNo, 2, remark == null ? "未知错误" : remark);
             if (pushOrder != null) {
                 REDIS.setCacheMapValue(pushOrderKey, "startChargeSeqStat", 4);
+            } else {
+                Map map = new HashMap<>();
+                map.put("startChargeSeqStat", Integer.valueOf(4));
+                REDIS.setCacheMap(pushOrderKey, map);
             }
         }
         return new ServiceResult(false);