From 6507640b14de9276666f090487ee061e3d3cc42b Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Tue, 7 Dec 2021 16:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E8=AE=A2=E5=8D=95=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evcs/api/QueryStartChargeController.java  | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java
index 97692174..410c9ae7 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java
@@ -45,7 +45,11 @@ public class QueryStartChargeController {
     public CommonResponse queryStartCharge(@RequestBody CommonRequest<StartChargeRequest> commonRequest) throws Exception {
 
         CommonResponse resp = new CommonResponse();
+        resp.setRet(EvcsConst.RET_FAIL);
         StartChargeResponse startChargeResponse = new StartChargeResponse();
+        startChargeResponse.setFailReason(0);
+        startChargeResponse.setSuccStat(1);
+        startChargeResponse.setStartChargeSeqStat(4);
         StartChargeRequest startChargeRequest = JSONUtil.readParams(commonRequest.getData(), StartChargeRequest.class);
         String startChargeSeq = startChargeRequest.getStartChargeSeq();
         String connectorId = startChargeRequest.getConnectorId();
@@ -53,6 +57,8 @@ public class QueryStartChargeController {
         String terminalStatus = (String) cacheGun.get("vehicleGunStatus");
         String status = (String) cacheGun.get("status");
         EtOrderMapping etOrderMapping = new EtOrderMapping();
+        Date now = DateUtils.getNowDate();
+        etOrderMapping.setCreateTime(now);
         etOrderMapping.setEvcsOrderNo(startChargeSeq);
         if (!"空闲".equals(status)) {
             resp.setMsg("终端状态异常:[".concat(status == null ? "未注册" : status).concat("]"));
@@ -69,6 +75,7 @@ public class QueryStartChargeController {
                     startChargeRequest.getChargingAmt(), plateNum, -1, connectorId);
             startChargeResponse.setStartChargeSeq(startChargeSeq);
             startChargeResponse.setConnectorID(connectorId);
+            resp.setMsg(res.getMsg());
             if (res.getCode() != 200) {
                 if (res.getCode() != 500) {
                     startChargeResponse.setFailReason(res.getCode());
@@ -77,29 +84,29 @@ public class QueryStartChargeController {
                 }
                 startChargeResponse.setSuccStat(1);
                 startChargeResponse.setStartChargeSeqStat(4);
+                emptyHorder(startChargeSeq, connectorId, etOrderMapping);
             } else {
-                startChargeResponse.setStartChargeSeqStat(1);
-                startChargeResponse.setSuccStat(0);
-                startChargeResponse.setFailReason(0);
+                Map<String, Object> etOrderData = (Map<String, Object>) res.getData();
+                if (etOrderData != null) {
+                    resp.setRet(EvcsConst.RET_SUCC);
+                    startChargeResponse.setStartChargeSeqStat(1);
+                    startChargeResponse.setSuccStat(0);
+                    startChargeResponse.setFailReason(0);
+                    Map<String, Object> pushOrder = new HashMap<>();
+                    pushOrder.put("startChargeSeqStat", 1);
+                    pushOrder.put("internetSerialNumber", startChargeRequest.getStartChargeSeq());
+                    pushOrder.put("connectorID", connectorId);
+                    pushOrder.put("startChargeNotificationStat", 0);
+                    pushOrder.put("chargeOrderInfoNotificationStat", 0);
+                    pushOrder.put("operatorId3rdpty", startChargeSeq.substring(0, 9));
+                    pushOrder.put("startTime", etOrderData.get("startTime"));
+                    String orderNo = (String) etOrderData.get("orderNo");
+                    etOrderMapping.setXhOrderNo(orderNo);
+                    REDIS.setCacheMap("pushOrder:".concat(orderNo), pushOrder);
+                } else {
+                    emptyHorder(startChargeSeq, connectorId, etOrderMapping);
+                }
             }
-            Map<String, Object> etOrderData = (Map<String, Object>) res.getData();
-            etOrderMapping.setXhOrderNo(String.valueOf(etOrderData.get("orderNo")));
-            Map<String, Object> pushOrder = new HashMap<>();
-            pushOrder.put("startChargeSeqStat", 1);
-            String orderNo = String.valueOf(etOrderData.get("orderNo"));
-            pushOrder.put("internetSerialNumber", startChargeRequest.getStartChargeSeq());
-            pushOrder.put("connectorID", connectorId);
-            pushOrder.put("startTime", etOrderData.get("startTime"));
-            pushOrder.put("startChargeNotificationStat", 0);
-            pushOrder.put("chargeOrderInfoNotificationStat", 0);
-            pushOrder.put("operatorId3rdpty", startChargeSeq.substring(0, 9));
-            REDIS.setCacheMap("pushOrder:".concat(orderNo), pushOrder);
-            if (res.getCode() != 200) {
-                resp.setRet(EvcsConst.RET_FAIL);
-            } else {
-                resp.setRet(EvcsConst.RET_SUCC);
-            }
-            resp.setMsg(res.getMsg());
         }
         etOrderMappingRepo.save(etOrderMapping);
         resp.setData(JSONUtil.toJSONString(startChargeResponse));