From beff27951ba72e8e6a9b36e4ba2e2bdb6163d117 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 18 Feb 2025 19:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=85=E7=94=B5=E5=81=9C?=
 =?UTF-8?q?=E8=BD=A6=E4=BC=98=E6=83=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/thirdparty/common/CommonService.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
index fc70a6ffc..fc6a13543 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
@@ -693,10 +693,15 @@ public class CommonService {
 
         // 判断订单创建时间,是否在优惠时间段内
         LocalTime createLocalTime = DateUtils.date2LocalDateTime(orderBasicInfo.getCreateTime()).toLocalTime();
-        if (createLocalTime.isBefore(chargeParkingDiscount.getStartTime()) || createLocalTime.isAfter(chargeParkingDiscount.getEndTime())) {
-            // 不在优惠时间段内
-            log.info("{}该订单不在优惠时间段({}-{})内", orderBasicInfo.getOrderCode(), chargeParkingDiscount.getStartTime(), chargeParkingDiscount.getEndTime());
-            return;
+        LocalTime startTime = chargeParkingDiscount.getStartTime();
+        LocalTime endTime = chargeParkingDiscount.getEndTime();
+        // startTime等于endTime,shuo则不需要判断, 如果startTime不等于endTime,则需要判断订单创建时间是否在优惠时间段内
+        if (!StringUtils.equals(startTime.toString(), endTime.toString())) {
+            if (createLocalTime.isBefore(startTime) || createLocalTime.isAfter(endTime)) {
+                // 不在优惠时间段内
+                log.info("{}该订单不在优惠时间段({}-{})内", orderBasicInfo.getOrderCode(), startTime, endTime);
+                return;
+            }
         }
 
         // 如果conditionType为1判断充电度数, 如果为2判断充电时长