From 6ddd75f22001324b6e2974cee1ee386886b6780c Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 7 Sep 2021 06:11:38 +0800 Subject: [PATCH] new balance --- .../java/com/xhpc/pp/controller/ChargingController.java | 2 +- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 6 +++--- 2 files changed, 4 insertions(+), 4 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 03ef54cf..24317056 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 @@ -230,7 +230,7 @@ public class ChargingController { Long pileRateModelId = (Long) cachePile.get("rateModelId"); cacheOrder.put("rateModelId", pileRateModelId); cacheOrder.put("pileNo", pileNo); - cacheOrder.put("balance", balance * 100); + cacheOrder.put("initBalance", balance * 100); cacheOrder.put("logicCardNo", startChargingData.getLogicCardNo()); cacheOrder.put("physicCardNo", startChargingData.getPhysicCardNo()); cacheOrder.put("gunId", startChargingData.getGunId()); 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 2a6a0142..fb880ed8 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 @@ -102,7 +102,7 @@ public class RealtimeDataLogic implements ServiceLogic { realtimeDataList = new ArrayList<>(); } StartChargingData startChargingData = new StartChargingData(); - Integer balance = (Integer) cacheOrder.get("balance"); + Integer balance = (Integer) cacheOrder.get("initBalance"); CacheRealtimeData cacheRealtimeData = translate(realtimeData); balance -= cacheRealtimeData.getAmountCharged(); // startChargingData.setBalance(balance); //todo make pile work then uncomment @@ -111,7 +111,7 @@ public class RealtimeDataLogic implements ServiceLogic { // startChargingData.setPileNo(cacheOrder.get("pileNo").toString()); // startChargingData.setGunId(cacheOrder.get("gunId").toString()); // Thread.sleep(300); -// chargingController.nativeRefreshBalance(startChargingData); +// chargingController.nativ-eRefreshBalance(startChargingData); cacheRealtimeData.setCreateTime(DateUtil.now()); String lord = orderkey.concat(".lord"); REDIS.setCacheObject(lord, cacheRealtimeData); @@ -119,7 +119,7 @@ public class RealtimeDataLogic implements ServiceLogic { Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt); if (socInt != 0) cacheOrder.put("endSoc", socInt); - cacheOrder.put("balance", balance); + cacheOrder.put("rbalance", balance); cacheOrder.put("remainingTime", tr); cacheOrder.put("status", statusplain); cacheOrder.put("realtimeDataList", realtimeDataList);