From 485d7dc40ddd04dffb6c3eaa2472306ebc069f74 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 31 Mar 2025 13:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=B8=8C=E6=99=93=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/service/TempService.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
index 40689fd1a..7d4ecb310 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
@@ -47,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -964,7 +965,12 @@ public class TempService {
         // 查询订单主表
         OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
 
-        LocalDateTime localDateTime = DateUtils.date2LocalDateTime(orderBasicInfo.getSettlementTime());
+        Date date = orderBasicInfo.getSettlementTime();
+        if (date == null) {
+            date = orderBasicInfo.getChargeEndTime();
+        }
+
+        LocalDateTime localDateTime = DateUtils.date2LocalDateTime(date);
         // 开始时间为localDateTime减30秒
         LocalDateTime startTime = localDateTime.minusSeconds(30);
         // 结束时间为localDateTime加30秒