From bde271fdbab51e654a293dba02a31eab8ff3ea8b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期四, 21 八月 2025 20:20:23 +0800
Subject: [PATCH] 白单流水报表与费用初始化（差创建折扣使用记录）0821

---
 java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
index 4fa3601..15f3532 100755
--- a/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
@@ -31,11 +31,11 @@
             #{payMaxEndTime}
         </if>
         ,
-        <if test="payMaxStarTime == ''">
-            #{payMaxStarTime}
+        <if test="payMaxStartTime == ''">
+            NULL
         </if>
-        <if test="payMaxStarTime != ''">
-            #{endTime}
+        <if test="payMaxStartTime != ''">
+            #{payMaxStartTime}
         </if>
         )
     </insert>
@@ -64,10 +64,10 @@
             and t.community_id= #{communityId}
         </if>
         <if test="currentTime !=null ">
-            and t.start_time &lt; #{currentTime}
+            and (t.start_time &lt; #{currentTime} or t.start_time is NULL)
         </if>
         <if test="currentTime !=null ">
-            and t.end_time &gt; #{currentTime}
+            and (t.end_time &gt; #{currentTime} or t.end_time is NULL)
         </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
@@ -93,6 +93,9 @@
         <if test="payMaxStarTime !=null and payMaxStarTime != ''">
             , t.pay_max_star_time= #{payMaxStarTime}
         </if>
+        <if test="payMaxEndTime !=null and payMaxEndTime != ''">
+            , t.paymax_end_time= #{payMaxEndTime}
+        </if>
         where 1=1
         <if test="configDiscountId !=null and configDiscountId != ''">
             and t.config_discount_id= #{configDiscountId}

--
Gitblit v1.8.0