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 d4b26367..ecce2d2b 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 @@ -6,7 +6,6 @@ import com.xhpc.common.api.PileOrderService; import com.xhpc.common.core.domain.R; import com.xhpc.common.data.redis.CacheOrderData; import com.xhpc.common.data.up.OrderData; -import com.xhpc.pp.controller.ChargingController; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -67,6 +66,7 @@ public class OrderDataLogic implements ServiceLogic { cacheOrder.put("status", "已结束"); cacheOrder.put("stopReason", translate(cacheOrderData.getStopReason())); cacheOrder.put("stopReasonHex", cacheOrderData.getStopReason()); + cacheOrder.put("stopTime", cacheOrderData.getEndTime()); REDIS.setCacheMap(orderkey, cacheOrder); String gunkey = "gun:".concat(orderData.getPileNo()).concat(orderData.getGunId()); Map cacheGun = REDIS.getCacheMap(gunkey); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java index 8c87a72a..6312e2ec 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java @@ -112,8 +112,8 @@ public class PileStartChargingDataLogic implements ServiceLogic { REDIS.setCacheMapValue("gun:".concat(connectorId), "orderkey", orderNo); String pushOrderKey = orderkey.replace("order:", "pushOrder:"); - Map map = new HashMap<>(); - map.put("startChargeSeqStat", Integer.valueOf(2)); + Map map = new HashMap<>(); + map.put("startChargeSeqStat", 2); REDIS.setCacheMap(pushOrderKey, map); resultStr = "00"; 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 6acd6880..11357bc6 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 @@ -147,6 +147,7 @@ public class RealtimeDataLogic implements ServiceLogic { cacheOrder.put("totalPower", cacheRealtimeData.getChargingDegree() / 10000.0); cacheOrder.put("totalMoney", cacheRealtimeData.getAmountCharged() / 10000.0); cacheOrder.put("realtimeDataList", realtimeDataList); + cacheOrder.put("lastOrderTime", DateUtil.now()); R r1 = pileOrderService.pileRimeOrder(orderNo); String msg = r1.getMsg(); if (msg!=null && msg.contains("无效订单")) {