优惠券数量bugfix

src/main/resources/mapper/ClubMapper.xml

@@ -251,13 +251,18 @@
     <select id="findCountCoupon" resultType="integer">
         SELECT COUNT(a.id)
         FROM cm_coupon_club a
-                 LEFT JOIN cm_coupon cc ON a.couponId = cc.id
+        LEFT JOIN cm_coupon cc ON a.couponId = cc.id
         WHERE cc.delFlag = 0
           AND a.delFlag = 0
           AND a.userId = #{userId}
           AND a.status = 1
-          AND NOW() BETWEEN cc.startDate
-            AND cc.endDate
+          AND (cc.couponType IN (0,1,3)
+            OR (cc.couponType = 2 AND a.userId = #{userId})
+            OR ((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ >= ]]> startDate AND couponType = 4))
+          and NOW() <![CDATA[ > ]]> startDate
+          and NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,
+                                       date_add(if((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ > ]]> startDate,(SELECT registerTime FROM user WHERE userID = #{userId}),startDate),interval receivePeriod day)
+            )
           AND cc.status != 2
     </select>
     <select id="findBeansHistoryByArchiveId" resultType="java.lang.Integer">