From 08d5529087390663115d326190635e4a4997acf2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 28 八月 2019 17:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
index 41cedb2..12554c0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
@@ -161,6 +161,13 @@
LIMIT #{count}
</select>
+
+ <select id="getCounponNowInvalidByUid" resultMap="BaseResultMap">
+ SELECT * FROM `yeshi_ec_user_system_coupon` cp
+ WHERE cp.`usc_uid` = #{uid} AND <![CDATA[cp.`usc_state` <> 3 AND cp.`usc_state` <> 4]]>
+ AND DATE_FORMAT(CURDATE(),'%Y%m%d') <![CDATA[>]]> DATE_FORMAT(cp.`usc_end_time`,'%Y%m%d')
+ </select>
+
<select id="getCouponByState" resultMap="BaseResultMap">
SELECT * FROM `yeshi_ec_user_system_coupon` cp
WHERE cp.`usc_uid` = #{uid}
--
Gitblit v1.8.0