From 5c5f8c565c4f607bbfb33b46355f093ab08ed95f Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 6 Nov 2025 11:32:43 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E4=BA=BA=E5=B7=A5=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/OrderService.java     | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 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 7920e6dd1..045902ec2 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -775,22 +776,32 @@ public class OrderService {
         // 充电度数
         String chargingDegree = dto.getChargingDegree();
 
-        // 先查交易记录
-        LocalDateTime localDateTime = DateUtils.date2LocalDateTime(orderBasicInfo.getSettlementTime());
+        // 获取订单结算时间
+        Date settlementTime = orderBasicInfo.getSettlementTime();
+
+        // 获取订单停止充电时间
+        Date chargeEndTime = orderBasicInfo.getChargeEndTime();
+
+        // 如果订单结算时间与订单停止充电时间都为空，则打印错误信息并返回
+        if (settlementTime == null && chargeEndTime == null) {
+            log.error("人工结算订单 error -订单结算时间与订单停止充电时间都为空");
+            return false;
+        }
+
+        LocalDateTime localDateTime = DateUtils.date2LocalDateTime(settlementTime != null ? settlementTime : chargeEndTime);
         // 开始时间为localDateTime减30秒
         LocalDateTime startTime = localDateTime.minusSeconds(30);
         // 结束时间为localDateTime加30秒
         LocalDateTime endTime = localDateTime.plusSeconds(30);
         // 查询这笔订单的交易记录原始数据
         List<PileMsgRecord> pileFeedListV2 = pileMsgRecordService.getPileFeedListV2(orderBasicInfo.getPileSn(), "0x3B", startTime, endTime);
-        if (CollectionUtils.isEmpty(pileFeedListV2)) {
-            // 如果没有交易记录原始数据，则使用停止充电时间作为开始时间和结束时间再查一次
-            localDateTime = DateUtils.date2LocalDateTime(orderBasicInfo.getChargeEndTime());
-            startTime = localDateTime.minusSeconds(30);
-            endTime = localDateTime.plusSeconds(30);
-            pileFeedListV2 = pileMsgRecordService.getPileFeedListV2(orderBasicInfo.getPileSn(), "0x3B", startTime, endTime);
-        }
-
+        // if (CollectionUtils.isEmpty(pileFeedListV2)) {
+        //     // 如果没有交易记录原始数据，则使用停止充电时间作为开始时间和结束时间再查一次
+        //     localDateTime = DateUtils.date2LocalDateTime(chargeEndTime);
+        //     startTime = localDateTime.minusSeconds(30);
+        //     endTime = localDateTime.plusSeconds(30);
+        //     pileFeedListV2 = pileMsgRecordService.getPileFeedListV2(orderBasicInfo.getPileSn(), "0x3B", startTime, endTime);
+        // }
         for (PileMsgRecord pileMsgRecord : pileFeedListV2) {
             TransactionRecordsData parse = JSONObject.parseObject(pileMsgRecord.getJsonMsg(), TransactionRecordsData.class);
             if (StringUtils.equals(parse.getTransactionCode(), orderBasicInfo.getTransactionCode())) {