|
|
@@ -57,7 +57,8 @@
|
|
|
<if test="userId > 0">
|
|
|
date_add(
|
|
|
if(couponType <![CDATA[ <= ]]> 3,
|
|
|
- if(#{registerTime} <![CDATA[ >= ]]> startTime,#{registerTime},startTime),
|
|
|
+ if(#{registerTime} <![CDATA[ >= ]]> startTime and if(permanentFlag = 1,true,#{registerTime} <![CDATA[ < ]]> endTime),
|
|
|
+ #{registerTime},startTime),
|
|
|
chcs.createTime
|
|
|
)
|
|
|
,interval receivePeriod DAY)
|
|
|
@@ -93,7 +94,7 @@
|
|
|
and (
|
|
|
(couponType = 1
|
|
|
or (couponType = 2 and chc.id in (select distinct couponId from cm_hehe_coupon_user where userId = #{userId} and couponId is not null))
|
|
|
- or (couponType = 3 and #{registerTime} <![CDATA[ >= ]]> startTime)
|
|
|
+ or (couponType = 3 and #{registerTime} <![CDATA[ >= ]]> startTime and if(permanentFlag = 1,true,#{registerTime} <![CDATA[ < ]]> endTime))
|
|
|
or (couponType = 4 and chcs.shareUserId = #{userId})
|
|
|
or (couponType = 5 and chcs.shareUserId = #{userId})
|
|
|
)
|
|
|
@@ -101,7 +102,8 @@
|
|
|
if(permanentFlag = 1,true,NOW() <![CDATA[ < ]]> endTime),
|
|
|
NOW() <![CDATA[ < ]]> date_add(
|
|
|
if(couponType <![CDATA[ <= ]]> 3,
|
|
|
- if(#{registerTime} <![CDATA[ >= ]]> startTime,#{registerTime},startTime),
|
|
|
+ if(#{registerTime} <![CDATA[ >= ]]> startTime and if(permanentFlag = 1,true,#{registerTime} <![CDATA[ < ]]> endTime),
|
|
|
+ #{registerTime},startTime),
|
|
|
chcs.createTime
|
|
|
)
|
|
|
,interval receivePeriod DAY))
|
Aslee