yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new balance

Browse Source
This commit is contained in:
ZZ 2021-09-07 06:11:38 +08:00
parent 654cf7b9e8
commit 6ddd75f220
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
View File

@ -230,7 +230,7 @@ public class ChargingController {
Long pileRateModelId = (Long) cachePile.get("rateModelId"); Long pileRateModelId = (Long) cachePile.get("rateModelId");
cacheOrder.put("rateModelId", pileRateModelId); cacheOrder.put("rateModelId", pileRateModelId);
cacheOrder.put("pileNo", pileNo); cacheOrder.put("pileNo", pileNo);
cacheOrder.put("balance", balance * 100); cacheOrder.put("initBalance", balance * 100);
cacheOrder.put("logicCardNo", startChargingData.getLogicCardNo()); cacheOrder.put("logicCardNo", startChargingData.getLogicCardNo());
cacheOrder.put("physicCardNo", startChargingData.getPhysicCardNo()); cacheOrder.put("physicCardNo", startChargingData.getPhysicCardNo());
cacheOrder.put("gunId", startChargingData.getGunId()); cacheOrder.put("gunId", startChargingData.getGunId());

6
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
View File

@ -102,7 +102,7 @@ public class RealtimeDataLogic implements ServiceLogic {
realtimeDataList = new ArrayList<>(); realtimeDataList = new ArrayList<>();
} }
StartChargingData startChargingData = new StartChargingData(); StartChargingData startChargingData = new StartChargingData();
Integer balance = (Integer) cacheOrder.get("balance"); Integer balance = (Integer) cacheOrder.get("initBalance");
CacheRealtimeData cacheRealtimeData = translate(realtimeData); CacheRealtimeData cacheRealtimeData = translate(realtimeData);
balance -= cacheRealtimeData.getAmountCharged(); balance -= cacheRealtimeData.getAmountCharged();
// startChargingData.setBalance(balance); //todo make pile work then uncomment // 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.setPileNo(cacheOrder.get("pileNo").toString());
// startChargingData.setGunId(cacheOrder.get("gunId").toString()); // startChargingData.setGunId(cacheOrder.get("gunId").toString());
// Thread.sleep(300); // Thread.sleep(300);
// chargingController.nativeRefreshBalance(startChargingData); // chargingController.nativ-eRefreshBalance(startChargingData);
cacheRealtimeData.setCreateTime(DateUtil.now()); cacheRealtimeData.setCreateTime(DateUtil.now());
String lord = orderkey.concat(".lord"); String lord = orderkey.concat(".lord");
REDIS.setCacheObject(lord, cacheRealtimeData); REDIS.setCacheObject(lord, cacheRealtimeData);
@ -119,7 +119,7 @@ public class RealtimeDataLogic implements ServiceLogic {
Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc");
if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt); if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt);
if (socInt != 0) cacheOrder.put("endSoc", socInt); if (socInt != 0) cacheOrder.put("endSoc", socInt);
cacheOrder.put("balance", balance); cacheOrder.put("rbalance", balance);
cacheOrder.put("remainingTime", tr); cacheOrder.put("remainingTime", tr);
cacheOrder.put("status", statusplain); cacheOrder.put("status", statusplain);
cacheOrder.put("realtimeDataList", realtimeDataList); cacheOrder.put("realtimeDataList", realtimeDataList);