Merge remote-tracking branch 'origin/developer' into developerC

src/main/resources/mapper/OrderClubMapper.xml

@@ -563,9 +563,9 @@
         AND a.delFlag = 0
         AND a.id = #{clubCouponId}
         AND a.status = 1
-        AND NOW() <![CDATA[ > ]]> startDate
-        AND NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,date_add(if((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and (SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,(SELECT registerTime FROM user WHERE userID = #{userId}),startDate),
-            interval receivePeriod day))
+        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))
         AND cc.status != 2
     </select>
     <select id="getOrderCouponRecord" resultType="com.caimei365.order.model.po.CouponOrderRecordPo">

src/main/resources/mapper/OrderCommonMapper.xml

@@ -540,7 +540,7 @@
                cc.couponPayWay
         FROM cm_coupon_club a
                  LEFT JOIN cm_coupon cc ON a.couponId = cc.id
-        WHERE cc.delFlag = 0
+        WHERE if(cc.moneyCouponFlag=2,cc.delFlag = 0,cc.id>0)
           AND a.delFlag = 0
           AND a.userId = #{userId}
           AND a.status = 1