From b99a10cff6b4c4d0965871be894fba8ba64605fc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 14:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml
index c98a9e7..a7fa091 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml
@@ -66,14 +66,14 @@
<select id="overdueList" resultMap="BaseResultMap">
SELECT * FROM yeshi_ec_user_system_coupon_give_record d
- WHERE d.`cgr_state` = 0 AND d.`cgr_end_time` IS NOT NULL AND d.`cgr_end_time` <![CDATA[<]]> CURDATE()
+ WHERE d.`cgr_state` = 0 AND d.`cgr_end_time` IS NOT NULL AND d.`cgr_end_time` <![CDATA[<]]> NOW()
LIMIT #{count}
</select>
<select id="overdueListByUser" resultMap="BaseResultMap">
SELECT * FROM yeshi_ec_user_system_coupon_give_record d
WHERE d.cgr_give_uid = #{uid} AND d.`cgr_state` = 0 AND d.`cgr_end_time` IS NOT NULL
- AND d.`cgr_end_time` <![CDATA[<]]> CURDATE()
+ AND d.`cgr_end_time` <![CDATA[<]]> NOW()
</select>
<select id="getByReceiveId" resultMap="BaseResultMap">
--
Gitblit v1.8.0