From 0272ffc3e7037e10c2ddadeea6c597850903878f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 30 八月 2019 14:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponRecordMapper.xml | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponRecordMapper.xml
index 652138f..7e4f8a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponRecordMapper.xml
@@ -87,15 +87,6 @@
separator=",">#{item}</foreach>
</select>
- <select id="getCouponByUsingTimeOut" resultMap="BaseResultMap">
- SELECT * FROM `yeshi_ec_user_system_coupon` cp
- LEFT JOIN `yeshi_ec_user_system_coupon_record` rd ON rd.`ucr_user_coupon_id` = cp.`usc_id`
- WHERE cp.`usc_uid` = #{uid} AND cp.`usc_state` = 2 AND rd.`ucr_state` = 0
- AND (cp.usc_give = 0 or cp.usc_give is null)
- AND (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(cp.`usc_use_time`)) <![CDATA[>]]> #{number};
- </select>
-
-
<select id="getNearByUserCouponId" resultMap="BaseResultMap">
SELECT * FROM `yeshi_ec_user_system_coupon_record`
WHERE ucr_user_coupon_id = #{userCouponId}
--
Gitblit v1.8.0