From dd2cf17eb2cf39066b02297371af40bb5578bfb3 Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 18 Nov 2021 13:55:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=94=99=E8=AF=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E8=87=B4=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/evcs/api/QueryEquipChargeStatusController.java | 2 +- .../evcs/notification/NotificationEquipChargeStatusTask.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java index 841b1b49..a598c52c 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java @@ -118,7 +118,7 @@ public class QueryEquipChargeStatusController { equipChargeStatus.setTotalMoney(lord.getAmountCharged() == null ? 0 : lord.getAmountCharged() / 10000.0); final Long rateModelId = REDIS.getCacheMapValue("pile:".concat(connectorId.substring(0, 14)), "rateModelId"); final CacheRateModel cacheRateModel = REDIS.getCacheObject("rateModel:" + rateModelId); - if (cacheRateModel != null) calculateEm(equipChargeStatus, cacheRateModel); + calculateEm(equipChargeStatus, cacheRateModel); CommonResponse response = new CommonResponse(); response.setRet(EvcsConst.RET_SUCC); response.setData(JSONUtil.toJSONString(equipChargeStatus)); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java index b24ef946..d12463a1 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java @@ -95,6 +95,10 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { public static void calculateEm(EquipChargeStatus equipChargeStatus, CacheRateModel cacheRateModel) { + if (cacheRateModel != null) { + equipChargeStatus.setChargeDetails(new ChargeDetails[0]); + return; + } final Date endTime = DateUtil.string2Date(equipChargeStatus.getEndTime()); final Date startTime = DateUtil.string2Date(equipChargeStatus.getStartTime()); long totalMilSec = endTime.getTime() - startTime.getTime();