优惠券使用期限同上下架时间

src/main/resources/mapper/CouponMapper.xml

@@ -30,7 +30,7 @@
             AND a.status = 1
             AND if(cc.vipFlag = 1,
             NOW() BETWEEN cc.startDate AND cc.endDate,
-            NOW() <![CDATA[ < ]]> date_add(a.createDate,interval cc.usePeriod DAY))
+            NOW() <![CDATA[ < ]]> IF(cc.usePeriod IS NULL,cc.endDate,DATE_ADD(a.createDate,INTERVAL cc.usePeriod DAY)))
         </if>
         <if test="status == 2">
             AND a.status = 2
@@ -39,7 +39,7 @@
             AND a.status = 1
             AND if(cc.vipFlag = 1,
             NOW() > cc.endDate,
-            NOW() <![CDATA[ > ]]> date_add(a.createDate,interval cc.usePeriod DAY))
+            NOW() <![CDATA[ < ]]> IF(cc.usePeriod IS NULL,cc.endDate,DATE_ADD(a.createDate,INTERVAL cc.usePeriod DAY)))
         </if>
         AND cc.status != 2
         ORDER BY
@@ -141,7 +141,7 @@
             endDate,#{registerTime},startDate) as startDate,
             if(useTimeFlag = 1 or receiveFlag = 1,endDate,
             date_add(if(#{registerTime} <![CDATA[ > ]]> startDate and #{registerTime} <![CDATA[ < ]]> endDate,
-                #{registerTime},startDate),interval receivePeriod day)) as endDate,
+            #{registerTime},startDate),interval receivePeriod day)) as endDate,
         </if>
         moneyCouponPrice,
         moneyCouponFlag,
@@ -161,7 +161,8 @@
         <if test="userId == null or userId == 0">
             AND couponType != 2
             AND NOW() <![CDATA[ > ]]> startDate
-            AND NOW() <![CDATA[ < ]]> if(useTimeFlag = 1 or receiveFlag = 1,endDate,date_add(startDate,interval receivePeriod day))
+            AND NOW() <![CDATA[ < ]]> if(useTimeFlag = 1 or receiveFlag = 1,endDate,date_add(startDate,interval
+            receivePeriod day))
         </if>
         <if test="userId != null and userId > 0">
             AND id NOT IN(SELECT couponId FROM cm_coupon_club WHERE userId = #{userId})
@@ -187,7 +188,7 @@
                if(useTimeFlag = 1 or receiveFlag = 1, endDate,
                   date_add(if(#{registerTime} <![CDATA[ > ]]> startDate and #{registerTime} <![CDATA[ < ]]> endDate, #{registerTime}, startDate),
                            interval receivePeriod day))                                                  as endDate,
-               date_add(NOW(), interval usePeriod day )                                                  as usePeriod,
+               if(usePeriod is null, endDate, date_add(NOW(), interval usePeriod day))                   as usePeriod,
 --                `endDate`,
                `couponType`,
                `userId`,