From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 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 8e4e6c5..5936161 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
@@ -171,6 +171,15 @@
 	ORDER BY uc.usc_state_activate desc, uc.`usc_create_time`
   </select>
   
+  <select id="getValidByUidAndType" resultMap="ResultVOMap">
+ 	 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_state = 1 AND t.usc_state_activate = 1 AND t.usc_uid = #{uid}
+		AND c.`sc_type`= #{type} AND t.`usc_end_time` <![CDATA[>]]> NOW() 
+  </select>
+  
+  
+  
   <select id="countUsableByUid" resultType="java.lang.Long">
   	SELECT IFNULL(count(cp.`usc_id`),0) FROM `yeshi_ec_user_system_coupon` cp
 	WHERE cp.`usc_state` = 1 AND cp.usc_state_activate = 1
@@ -208,21 +217,6 @@
 	WHERE usc_uid = #{uid} AND usc_coupon_id = #{couponId} 
 		AND (usc_state_activate = 0 OR usc_state_activate is null)
   </select>
-  
-  <select id="getIncludeExchange" 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_state = 1 AND t.usc_state_activate = 1 AND t.usc_uid = #{uid}
-		AND c.`sc_percent` = #{num} AND c.`sc_type`= #{type} 
-  </select>
-  
-  <select id="getIncludeNotExchange" resultMap="ResultVOMap">
- 	 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_state = 1 AND t.usc_state_activate = 1 AND t.usc_uid = #{uid}
-		AND c.`sc_percent` <![CDATA[<>]]> #{num} AND c.`sc_type`= #{type} 
-  </select>
-  
   
   <select id="getCouponByUsingTimeOut" resultMap="BaseResultMap">
     SELECT * FROM `yeshi_ec_user_system_coupon` cp

--
Gitblit v1.8.0