From 9d401723afe4fd680f60f97b8d927efea6344a6f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 14:54:22 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml | 8 +++++++-
1 files changed, 7 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 ce92158..db50a03 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
@@ -121,7 +121,7 @@
AND uc.usc_coupon_id in
<foreach collection="list" item="item" open="(" close=")"
separator=",">#{item}</foreach>
- ORDER BY uc.usc_state_activate, uc.`usc_create_time`
+ ORDER BY uc.usc_state_activate desc, uc.`usc_create_time`
</select>
<select id="getCounponNowInvalid" resultMap="BaseResultMap">
@@ -138,4 +138,10 @@
</if>
</select>
+ <select id="getCouponByTypeAndNotActivated" resultMap="BaseResultMap">
+ SELECT * FROM yeshi_ec_user_system_coupon
+ WHERE usc_uid = #{uid} AND usc_coupon_id = #{couponId}
+ AND (usc_state_activate = 0 OR usc_state_activate is null)
+ </select>
+
</mapper>
--
Gitblit v1.8.0