From 9ec0a61f90ac2464eebc643bfe2d93ac9ba6e569 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期六, 23 八月 2025 10:59:18 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09

---
 java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
index 5e8a6fd..15f3532 100755
--- a/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
@@ -7,9 +7,36 @@
     <!-- 淇濆瓨璐圭敤椤规姌鎵ｄ俊鎭� add by wuxw 2018-07-03 -->
     <insert id="savePayFeeConfigDiscountInfo" parameterType="Map">
         insert into pay_fee_config_discount(
-        config_discount_id,config_id,discount_id,community_id,start_time,end_time,paymax_end_time
+        config_discount_id,config_id,discount_id,community_id,start_time,end_time,paymax_end_time,pay_max_star_time
         ) values (
-        #{configDiscountId},#{configId},#{discountId},#{communityId},#{startTime},#{endTime},#{payMaxEndTime}
+        #{configDiscountId},#{configId},#{discountId},#{communityId},
+                  <if test="startTime == ''">
+                      NULL
+                  </if>
+                    <if test="startTime != ''">
+                        #{startTime}
+                    </if>
+                  ,
+        <if test="endTime == ''">
+            NULL
+        </if>
+        <if test="endTime != ''">
+            #{endTime}
+        </if>
+        ,
+        <if test="payMaxEndTime == ''">
+            NULL
+        </if>
+        <if test="payMaxEndTime != ''">
+            #{payMaxEndTime}
+        </if>
+        ,
+        <if test="payMaxStartTime == ''">
+            NULL
+        </if>
+        <if test="payMaxStartTime != ''">
+            #{payMaxStartTime}
+        </if>
         )
     </insert>
 
@@ -17,7 +44,7 @@
     <select id="getPayFeeConfigDiscountInfo" parameterType="Map" resultType="Map">
         select t.config_discount_id,t.config_discount_id configDiscountId,t.config_id,t.config_id
         configId,t.status_cd,t.status_cd statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id
-        communityId,fd.discount_name discountName,fd.discount_type discountType,t.start_time startTime,t.end_time endTime,t.paymax_end_time payMaxEndTime
+        communityId,fd.discount_name discountName,fd.discount_type discountType,t.start_time startTime,t.end_time endTime,t.paymax_end_time payMaxEndTime,t.pay_max_star_time payMaxStarTime
         from pay_fee_config_discount t
         left join fee_discount fd on t.discount_id = fd.discount_id and t.community_id = fd.community_id and fd.status_cd = '0'
         where 1 =1
@@ -37,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 ">
@@ -63,6 +90,12 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
+        <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