|
@@ -140,9 +140,7 @@
|
|
|
AND cc.status != 2
|
|
|
AND cs.delFlag = 0
|
|
|
AND cmn.status != 2
|
|
|
- <if test="useTime != null and useTime != ''">
|
|
|
- AND cmn.useTime=#{useTime}
|
|
|
- </if>
|
|
|
+ AND NOW() BETWEEN cc.startdate AND cc.enddate
|
|
|
ORDER BY cc.startDate DESC
|
|
|
</select>
|
|
|
|
|
@@ -151,18 +149,21 @@
|
|
|
FROM cm_coupon_club a
|
|
|
INNER JOIN cm_svip_coupon cs ON a.couponId = cs.couponId
|
|
|
left join cm_svip_coupon_month cmn on cmn.id = cs.montId
|
|
|
+ LEFT JOIN cm_coupon cc ON cs.couponId = cc.id
|
|
|
WHERE a.userId = #{userId}
|
|
|
- AND cmn.useTime = #{useTime}
|
|
|
+ AND NOW() BETWEEN cc.startDate AND cc.endDate
|
|
|
</select>
|
|
|
|
|
|
<select id="findCouponUse" resultType="java.lang.Integer">
|
|
|
select ccb.couponId from cm_coupon_club ccb
|
|
|
inner join cm_svip_coupon cs ON cs.couponId = ccb.couponId
|
|
|
left join cm_svip_coupon_month cmn on cmn.id=cs.montId
|
|
|
+ LEFT JOIN cm_coupon cc ON cs.couponId = cc.id
|
|
|
where ccb.userId=#{userId} and ccb.status=2 AND ccb.delFlag=0
|
|
|
- <if test="useTime != null and useTime !=''">
|
|
|
+ AND NOW() BETWEEN cc.startDate AND cc.endDate
|
|
|
+ <!--<if test="useTime != null and useTime !=''">
|
|
|
and cmn.useTime=#{useTime}
|
|
|
- </if>
|
|
|
+ </if>-->
|
|
|
</select>
|
|
|
|
|
|
<select id="findMobile" resultType="java.lang.String">
|