From 65e3c0e5d8e9f93d07f1cb9396cd84d49d6dcf4a Mon Sep 17 00:00:00 2001
From: zz <Admin123>
Date: Fri, 3 Sep 2021 05:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E4=BD=99=E9=A2=9D=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhpc/pp/controller/ChargingController.java   |  4 ++++
 .../com/xhpc/pp/logic/RealtimeDataLogic.java     | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
index 36257a5b..8c7c5da3 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
@@ -229,7 +229,11 @@ public class ChargingController {
             Map<String, Object> cachePile = REDIS.getCacheMap(pkey);
             Long pileRateModelId = (Long) cachePile.get("rateModelId");
             cacheOrder.put("rateModelId", pileRateModelId);
+            cacheOrder.put("pileNo", pileNo);
             cacheOrder.put("balance", balance * 100);
+            cacheOrder.put("logicCardNo", startChargingData.getLogicCardNo());
+            cacheOrder.put("physicCardNo", startChargingData.getPhysicCardNo());
+            cacheOrder.put("gunId", startChargingData.getGunId());
             cacheOrder.put("tel", startChargingData.getTel());
             cacheOrder.put("stopSoc", startChargingData.getSoc());
             cacheOrder.put("startSoc", 0);
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 cd1c93f2..ec8ac88f 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
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xhpc.common.api.PileOrderService;
 import com.xhpc.common.api.SmsService;
 import com.xhpc.common.core.domain.R;
+import com.xhpc.common.data.down.StartChargingData;
 import com.xhpc.common.data.redis.CacheRealtimeData;
 import com.xhpc.common.data.up.RealtimeData;
 import com.xhpc.pp.controller.ChargingController;
@@ -98,12 +99,21 @@ public class RealtimeDataLogic implements ServiceLogic {
             if (realtimeDataList == null) {
                 realtimeDataList = new ArrayList<>();
             }
+            StartChargingData startChargingData = new StartChargingData();
             Integer balance = (Integer) cacheOrder.get("balance");
             CacheRealtimeData cacheRealtimeData = translate(realtimeData);
-            realtimeDataList.add(cacheRealtimeData);
-            String lord = orderkey.concat(".lord");
+            balance -= cacheRealtimeData.getAmountCharged();
+            startChargingData.setBalance(balance);
+            startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString());
+            startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString());
+            startChargingData.setPileNo(cacheOrder.get("pileNo").toString());
+            startChargingData.setGunId(cacheOrder.get("gunId").toString());
+            Thread.sleep(300);
+            chargingController.nativeRefreshBalance(startChargingData);
             cacheRealtimeData.setCreateTime(DateUtil.now());
+            String lord = orderkey.concat(".lord");
             REDIS.setCacheObject(lord, cacheRealtimeData);
+            realtimeDataList.add(cacheRealtimeData);
             Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc");
             if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt);
             if (socInt != 0) cacheOrder.put("endSoc", socInt);
@@ -127,7 +137,7 @@ public class RealtimeDataLogic implements ServiceLogic {
                     }
                 }
             }
-            if ((balance - cacheRealtimeData.getAmountCharged()) < 50000) {
+            if (balance < 50000) {
                 String alerted = (String) cacheOrder.get("lt5alerted");
                 String tel = (String) cacheOrder.get("tel");
                 if (alerted == null && tel != null) {