|
@@ -443,8 +443,8 @@
|
|
|
cc.id AS couponId,
|
|
|
cc.couponAmount,
|
|
|
cc.touchPrice,
|
|
|
- a.createDate as startDate,
|
|
|
- date_add(a.createDate,interval cc.usePeriod day) as endDate,
|
|
|
+ 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,
|
|
|
cc.couponType,
|
|
|
cc.userId,
|
|
|
cc.shopId,
|
|
@@ -456,8 +456,9 @@
|
|
|
AND a.delFlag = 0
|
|
|
AND a.userId = #{userId}
|
|
|
AND a.status = 1
|
|
|
- AND NOW() BETWEEN a.createDate
|
|
|
- AND date_add(a.createDate,interval cc.usePeriod 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
|
|
|
ORDER BY a.createDate DESC
|
|
|
</select>
|