From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml |   15 +++++++++++++++
 1 files changed, 15 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 a22375a..e94ec4f 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
@@ -157,4 +157,19 @@
 		AND (usc_state_activate = 0 OR usc_state_activate is null)
   </select>
   
+  <select id="getIncludeExchange" resultMap="BaseResultMap">
+	SELECT * FROM yeshi_ec_user_system_coupon 
+	WHERE usc_state_activate = 1 AND usc_state = 1
+		  AND usc_uid = #{uid} AND usc_source in
+		  <foreach collection="list" item="item" open="(" close=")"
+			separator=",">#{item}</foreach>
+  </select>
+  
+  <select id="getIncludeNotExchange" resultMap="BaseResultMap">
+	SELECT * FROM yeshi_ec_user_system_coupon 
+	WHERE usc_state_activate = 1 AND usc_state = 1
+		  AND usc_uid = #{uid} AND usc_source not in 
+		  <foreach collection="list" item="item" open="(" close=")"
+			separator=",">#{item}</foreach>
+  </select>
 </mapper>

--
Gitblit v1.8.0