From e021e32a6ff0ec216f69c24f7ea929798bdce4c5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 11:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java
index 7fc6f17..0a7d298 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java
@@ -114,4 +114,21 @@
 	long countUsableByUid(@Param("uid") Long uid, @Param("list") List<Long> listCouponId);
 
 
+	/**
+	 *  鏌ヨ鍏嶅埜
+	 * @param uid
+	 * @param source
+	 * @return
+	 */
+	List<UserSystemCoupon> getFreeCouponByType(@Param("uid") Long uid, @Param("type") String type);
+	
+	
+	/**
+	 *  鏌ヨ闇�瑕佹縺娲荤殑鍏嶅埜
+	 * @param uid
+	 * @param source
+	 * @return
+	 */
+	UserSystemCoupon getNeedActivateCouponByType(@Param("uid") Long uid, @Param("type") String type);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0