From 9319c42fe02d041cee260ca0db8df67bcdf1ea0a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 13:53:16 +0800
Subject: [PATCH] 免单券激活方式调整

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 f4048cb..380e468 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
@@ -216,9 +216,17 @@
 			separator=",">#{item}</foreach>
   </select>
   
- <select id="getFreeCouponByType" resultMap="BaseResultMap">
+  <select id="getFreeCouponByType" resultMap="BaseResultMap">
  	SELECT * FROM `yeshi_ec_user_system_coupon` t
 	LEFT JOIN `yeshi_ec_system_coupon` c ON t.`usc_coupon_id` = c.`sc_id`
 	WHERE t.usc_uid = #{uid} AND c.`sc_type`= #{type} 
   </select>
+  
+  <select id="getNeedActivateFreeCouponByType" resultMap="BaseResultMap">
+ 	SELECT * FROM `yeshi_ec_user_system_coupon` t
+	LEFT JOIN `yeshi_ec_system_coupon` c ON t.`usc_coupon_id` = c.`sc_id`
+	WHERE t.usc_uid = #{uid} AND c.`sc_type`= #{type}  AND (t.usc_state_activate = 0 OR t.usc_state_activate is null)
+	ORDER BY usc_id
+  </select>
+  
 </mapper>

--
Gitblit v1.8.0