From be2be40e9b42b40d86bcb3fec9effe412fd14e22 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Wed, 18 Aug 2021 16:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhpc/common/api/factory/PileOrderFallbackFactory.java  | 3 +--
 .../src/main/java/com/xhpc/pp/logic/OrderDataLogic.java    | 2 +-
 .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 1 +
 .../java/com/xhpc/pp/server/ChargingPileBinaryHandler.java | 4 +++-
 .../src/main/java/com/xhpc/pp/tx/ServiceResult.java        | 7 +++++++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
index bab6db66..1d444de6 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
@@ -2,7 +2,6 @@ package com.xhpc.common.api.factory;
 
 import com.xhpc.common.api.PileOrderService;
 import com.xhpc.common.core.domain.R;
-import com.xhpc.common.dto.PileEndOrder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -37,7 +36,7 @@ public class PileOrderFallbackFactory implements FallbackFactory<PileOrderServic
             @Override
             public R pileEndOrder(String orderNo) {
 
-                return R.fail("桩订单结束回调接口失败:" + cause.getMessage());
+                return null;
             }
 
             @Override
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 333abfda..6643eba0 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
@@ -52,7 +52,7 @@ public class OrderDataLogic implements ServiceLogic {
         String seq = seqHex(skey);
         String resultStr = "6815".concat(seq).concat("0040").concat(orderNo).concat(ServiceResult.HEX_OK);
         resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr));
-        return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK);
+        return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK, orderNo);
     }
 
     private CacheOrderData translate(OrderData orderData) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
index 01744dc7..a288777a 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
@@ -110,6 +110,7 @@ public class RealtimeDataLogic implements ServiceLogic {
             cacheOrder.put("realtimeDataList", realtimeDataList);
             orderkey = (String) cacheGun.get("orderkey");
             REDIS.setCacheMap(orderkey, cacheOrder);
+            pileOrderService.pileRimeOrder(orderNo);
             if ((balance - cacheRealtimeData.getAmountCharged()) < 500) {
                 String alerted = (String) cacheOrder.get("lt5alerted");
                 String tel = (String) cacheOrder.get("tel");
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
index 3eca3848..c02f26fa 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.nacos.api.exception.NacosException;
 import com.xhpc.common.api.PileOrderService;
 import com.xhpc.common.api.dto.ChargingStationDto;
+import com.xhpc.common.core.domain.R;
 import com.xhpc.pp.domain.ServiceField;
 import com.xhpc.pp.logic.FieldLogic;
 import com.xhpc.pp.logic.ServiceMainLogic;
@@ -105,7 +106,8 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler {
         } else if (SERVICE_RMCR.equals(serviceName) && OK.equals(resultCode)) {
             setCachePileRM(pilekey);
         } else if (SERVICE_OD.equals(serviceName) && OK.equals(resultCode)) {
-//            pileOrderService.pileEndOrder(); todo
+            R r = pileOrderService.pileEndOrder(result.getMsg());
+            if (r.getCode() != 200) return;
         }
         if (result.getBinary() != null) {
             log.info("server send msg >>>> ({}) |{}|", pileNo, toHex(result.getBinary()));
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceResult.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceResult.java
index a2fb3012..b2166efa 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceResult.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceResult.java
@@ -48,6 +48,13 @@ public class ServiceResult {
         this.code = OK;
     }
 
+    public ServiceResult(byte[] binary, String code, String msg) {
+
+        this.binary = binary;
+        this.code = code;
+        this.msg = msg;
+    }
+
     public ServiceResult(byte[] binary, String code) {
 
         this.binary = binary;