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

下发余额与友好提示

Browse Source
This commit is contained in:
ZZ 2021-09-06 18:22:16 +08:00
parent 869572c8da
commit 62b3381288
2 changed files with 7 additions and 7 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

@ -217,7 +217,7 @@ public class ChargingController {
if (!"空闲".equals(gunstatus)) {
return R.fail("端口不在空闲或正常状态,稍后再试");
}
if (CacheDataUtils.hori(gunkey)) return R.fail("等待上一条指令响应");
if (CacheDataUtils.hori(gunkey)) return R.fail("请检查终端号是否正确,稍后再试");
String skey = gunkey.concat(".seqhex");
String seq = seqHex(skey);
byte[] msg = translateStart(startChargingData, seq);

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

@ -105,13 +105,13 @@ public class RealtimeDataLogic implements ServiceLogic {
Integer balance = (Integer) cacheOrder.get("balance");
CacheRealtimeData cacheRealtimeData = translate(realtimeData);
balance -= cacheRealtimeData.getAmountCharged();
// startChargingData.setBalance(balance); //todo make pile work then uncomment
// startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString());
// startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString());
// startChargingData.setPileNo(cacheOrder.get("pileNo").toString());
// startChargingData.setGunId(cacheOrder.get("gunId").toString());
startChargingData.setBalance(balance); //todo make pile work then uncomment
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);
chargingController.nativeRefreshBalance(startChargingData);
cacheRealtimeData.setCreateTime(DateUtil.now());
String lord = orderkey.concat(".lord");
REDIS.setCacheObject(lord, cacheRealtimeData);