From 8a163bb29286c6e459b9e4da91c8e7f4138a38f7 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 22 Nov 2024 16:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=93=9D=E7=89=99=E5=85=85?=
 =?UTF-8?q?=E7=94=B5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/OrderService.java     | 20 +++++++++++++------
 .../enums/ykc/YKCChargingStopReasonEnum.java  |  1 -
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 1fd94afb2..6f15e2f76 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -1476,12 +1476,16 @@ public class OrderService {
         // record.setEndSoc(dto.getEndSoc());
         record.setAmmeterTotalStart(dto.getStartKwh());
         record.setAmmeterTotalEnd(dto.getStopKwh());
-        record.setTotalUsedElectricity(new BigDecimal(dto.getTotalEnergy()));
-        record.setSharpUsedElectricity(new BigDecimal(dto.getEnergySharp()));
-        record.setPeakUsedElectricity(new BigDecimal(dto.getEnergyPeak()));
-        record.setFlatUsedElectricity(new BigDecimal(dto.getEnergyFlat()));
-        record.setValleyUsedElectricity(new BigDecimal(dto.getEnergyValley()));
-        record.setReason(dto.getStopReason());
+        record.setTotalUsedElectricity(StringUtils.isNotBlank(dto.getTotalEnergy()) ? new BigDecimal(dto.getTotalEnergy()) : BigDecimal.ZERO);
+        record.setSharpUsedElectricity(StringUtils.isNotBlank(dto.getEnergySharp()) ? new BigDecimal(dto.getEnergySharp()) : BigDecimal.ZERO);
+        record.setPeakUsedElectricity(StringUtils.isNotBlank(dto.getEnergyPeak()) ? new BigDecimal(dto.getEnergyPeak()) : BigDecimal.ZERO);
+        record.setFlatUsedElectricity(StringUtils.isNotBlank(dto.getEnergyFlat()) ? new BigDecimal(dto.getEnergyFlat()) : BigDecimal.ZERO);
+        record.setValleyUsedElectricity(StringUtils.isNotBlank(dto.getEnergyValley()) ? new BigDecimal(dto.getEnergyValley()) : BigDecimal.ZERO);
+        if (StringUtils.isNotBlank(dto.getStopReason())) {
+            int i = Integer.parseInt(dto.getStopReason(), 16);
+            String stopReasonMsg = YKCChargingStopReasonEnum.getMsgByCode(i);
+            record.setReason(stopReasonMsg);
+        }
         record.setTradeDate(DateUtils.parseDate(dto.getTradeTime()));
         record.setSourceType("BT");
         record.setCreateBy(dto.getMemberId());
@@ -1491,4 +1495,8 @@ public class OrderService {
         record.setDelFlag(DelFlagEnum.NORMAL.getValue());
         personalChargingRecordService.insertOrUpdateSelective(record);
     }
+
+    public static void main(String[] args) {
+
+    }
 }
diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/YKCChargingStopReasonEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/YKCChargingStopReasonEnum.java
index c9a0f2e29..6a12ff8d8 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/YKCChargingStopReasonEnum.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/YKCChargingStopReasonEnum.java
@@ -115,7 +115,6 @@ public enum YKCChargingStopReasonEnum {
     ;
 
 
-
     private int code;
     private String msg;