From 4f81f34d59b9378b7dd3e1ab67b81092ed453173 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Thu, 9 Dec 2021 11:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A5=E6=AD=BB=E7=9A=84=E7=A9=BA=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=93=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/evcs/dto/ChargeOrderInfo.java    | 30 +++++++++----------
 .../NotificationStartChargeResultTask.java    |  2 +-
 .../NotificationStopChargeResultTask.java     |  4 ++-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeOrderInfo.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeOrderInfo.java
index 40455af7..be35422e 100644
--- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeOrderInfo.java
+++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeOrderInfo.java
@@ -127,21 +127,21 @@ public class ChargeOrderInfo {
                 xhpcHistoryOrder.getXhpcStatisticsTimeIntervalList();
         this.sumPeriod = xhpcStatisticsTimeIntervalList == null ? 0 : xhpcStatisticsTimeIntervalList.size();
         this.chargeDetails = translate(xhpcStatisticsTimeIntervalList);
-        Date starttime = xhpcHistoryOrder.getStartTime();
-        Date endtime = xhpcHistoryOrder.getEndTime();
-        int cl = 0;
-        if (starttime != null && endtime != null) {
-            cl = Math.toIntExact((endtime.getTime() - starttime.getTime()) / 1000);
-        }
-        String starttimestr = DateUtil.date2StringDt(starttime);
-        String endtimestr = DateUtil.date2StringDt(endtime);
-        if (cl < 0) {
-            String tmp = endtimestr;
-            endtimestr = starttimestr;
-            starttimestr = tmp;
-        }
-        this.startTime = starttimestr;
-        this.endTime = endtimestr;
+//        Date starttime = xhpcHistoryOrder.getStartTime();
+//        Date endtime = xhpcHistoryOrder.getEndTime();
+//        int cl = 0;
+//        if (starttime != null && endtime != null) {
+//            cl = Math.toIntExact((endtime.getTime() - starttime.getTime()) / 1000);
+//        }
+//        String starttimestr = DateUtil.date2StringDt(starttime);
+//        String endtimestr = DateUtil.date2StringDt(endtime);
+//        if (cl < 0) {
+//            String tmp = endtimestr;
+//            endtimestr = starttimestr;
+//            starttimestr = tmp;
+//        }
+//        this.startTime = starttimestr;
+//        this.endTime = endtimestr; //fuck it!!
     }
 
     private ChargeDetails[] translate(List<XhpcStatisticsTimeInterval> xhpcStatisticsTimeIntervalList) {
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java
index 20199be6..96f86b5d 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java
@@ -40,7 +40,7 @@ public class NotificationStartChargeResultTask extends CoreDispatcher {
         Collection<String> pushOrderKeys = REDIS.keys("pushOrder:*");
         for (String pushOrderKey : pushOrderKeys) {
             Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey);
-            if ((Integer) pushOrder.get("startChargeSeqStat") > 1) {
+            if (pushOrder.get("startChargeSeqStat") != null && (Integer) pushOrder.get("startChargeSeqStat") > 1) {
                 Integer startChargeNotificationStat = (Integer) pushOrder.get("startChargeNotificationStat");
                 if (null != startChargeNotificationStat && 1 != startChargeNotificationStat && startChargeNotificationStat <= 20) {
                     String startChargeSeq = (String) pushOrder.get("internetSerialNumber");
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java
index ad431142..6ea8af28 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java
@@ -53,7 +53,9 @@ public class NotificationStopChargeResultTask extends CoreDispatcher {
             String orderkey = "order:".concat(orderNo);
             CacheOrderData orderData = REDIS.getCacheMapValue(orderkey, "orderData");
             Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey);
-            if (orderData != null || (Integer) pushOrder.get("startChargeSeqStat") > 3) {
+            if (orderData != null || (pushOrder != null &&
+                    pushOrder.get("startChargeSeqStat") != null &&
+                    (Integer) pushOrder.get("startChargeSeqStat") > 3)) {
                 Boolean isStopNotified = (Boolean) pushOrder.get("isStopNotified");
                 if (isStopNotified == null || !isStopNotified) {
                     String internetSerialNumber = (String) pushOrder.get("internetSerialNumber");