From d88c167fc5973a2c15ff1539e4cdab36e4a7842c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 14:47:15 +0800
Subject: [PATCH] 奖励券使用区分订单下单三方日期
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 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 e94ec4f..41cedb2 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
@@ -113,6 +113,24 @@
AND TO_DAYS(uc.`usc_create_time`) = TO_DAYS(NOW())
</select>
+
+ <select id="getCouponListOld" resultMap="ResultVOMap">
+ SELECT * FROM `yeshi_ec_user_system_coupon` uc
+ LEFT JOIN `yeshi_ec_system_coupon` c ON uc.`usc_coupon_id` = c.`sc_id`
+ WHERE uc.`usc_uid`= #{uid} AND DATEDIFF(NOW(), uc.`usc_end_time`)<![CDATA[<=]]> 30
+ AND (uc.`usc_give` IS NULL OR uc.`usc_give` = 0) AND c.`sc_type` NOT IN ('freeCoupon','freeCouponBuy','freeCouponGive')
+ ORDER BY uc.`usc_state`,uc.`usc_create_time` DESC
+ LIMIT #{start},#{count}
+ </select>
+
+ <select id="countCouponOld" resultType="java.lang.Long">
+ SELECT IFNULL(count(uc.`usc_id`),0) FROM `yeshi_ec_user_system_coupon` uc
+ LEFT JOIN `yeshi_ec_system_coupon` c ON uc.`usc_coupon_id` = c.`sc_id`
+ WHERE uc.`usc_uid`= #{uid} AND DATEDIFF(NOW(), uc.`usc_end_time`)<![CDATA[<=]]> 30
+ AND (uc.`usc_give` IS NULL OR uc.`usc_give` = 0) AND c.`sc_type` NOT IN ('freeCoupon','freeCouponBuy','freeCouponGive')
+ </select>
+
+
<select id="getUserCouponVOList" resultMap="ResultVOMap">
SELECT * FROM `yeshi_ec_user_system_coupon` uc
WHERE uc.`usc_uid`= #{uid} AND DATEDIFF(NOW(), uc.`usc_end_time`)<![CDATA[ <= ]]> 30
@@ -158,18 +176,16 @@
</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 * 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="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 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>
</mapper>
--
Gitblit v1.8.0