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秒