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

src/main/resources/mapper/OrderClubMapper.xml

@@ -638,7 +638,7 @@
           AND a.status = 1
           AND if(cc.vipFlag = 1,
                  NOW() BETWEEN cc.startDate AND cc.endDate,
-                 NOW() BETWEEN a.createDate AND date_add(a.createDate, interval cc.usePeriod day))
+                 NOW() BETWEEN a.createDate AND if(useTimeFlag=1,cc.endDate,date_add(a.createDate, interval cc.usePeriod day)))
           AND cc.status != 2
     </select>
     <select id="getOrderCouponRecord" resultType="com.caimei365.order.model.po.CouponOrderRecordPo">

src/main/resources/mapper/OrderCommonMapper.xml

@@ -493,7 +493,7 @@
         </if>
         <if test="userId >0">
             if(#{registerTime} <![CDATA[ > ]]> startDate,#{registerTime},startDate) as startDate,
-            if(receiveFlag=1,endDate,date_add(if(#{registerTime} <![CDATA[ > ]]> startDate and #{registerTime}
+            if(useTimeFlag=1 or receiveFlag=1,endDate,date_add(if(#{registerTime} <![CDATA[ > ]]> startDate and #{registerTime}
             <![CDATA[ < ]]> endDate,#{registerTime},startDate),interval receivePeriod day)) as endDate,
         </if>
         couponType,
@@ -531,7 +531,7 @@
                cc.moneyCouponPrice,
                cc.moneyCouponType,
                if(cc.vipFlag = 1, cc.startDate, a.createDate)                                    as startDate,
-               if(cc.vipFlag = 1, cc.endDate, date_add(a.createDate, interval cc.usePeriod day)) as endDate,
+               if(cc.useTimeFlag = 1 or cc.vipFlag = 1, cc.endDate, date_add(a.createDate, interval cc.usePeriod day)) as endDate,
                cc.couponType,
                cc.userId,
                cc.shopId,