From 4fe5f879c1b2919099a6e193ab4db8d25725ca40 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 10:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml |    5 +++++
 1 files changed, 5 insertions(+), 0 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 e5386c7..059f4c1 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
@@ -97,6 +97,11 @@
     LIMIT #{start},#{count}
   </select>
   
+  <select id="getUserCouponBySource" resultMap="BaseResultMap">
+	SELECT * FROM `yeshi_ec_user_system_coupon` uc
+	WHERE uc.`usc_uid`= #{uid} AND usc_source = #{source}
+  </select>
+  
   <select id="getUserCouponVOList" resultMap="ResultVOMap">
 	SELECT * FROM `yeshi_ec_user_system_coupon` uc
 	WHERE uc.`usc_uid`= #{uid}

--
Gitblit v1.8.0