From d440fc97a7061447fe44ae333e86b29357439104 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 11:01:18 +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 237a1d2..8fdb9fd 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
@@ -65,4 +65,21 @@
 	 */
 	List<UserSystemCoupon> getCouponByTypeAndNotActivated(@Param("uid") Long uid, @Param("couponId") Long couponId);
 	
+//	/**
+//	 *  鏌ヨ鍏戞崲鐨勫埜
+//	 * @param uid
+//	 * @param source
+//	 * @return
+//	 */
+//	List<UserSystemCoupon> countIncludeExchange(@Param("uid") Long uid, @Param("source") String source);
+//	
+//	
+//	/**
+//	 *  鏌ヨ鎺掑嚭鍏戞崲鐨勫埜
+//	 * @param uid
+//	 * @param source
+//	 * @return
+//	 */
+//	List<UserSystemCoupon> countNotIncludeExchange(@Param("uid") Long uid, @Param("source") String source);
+//	
 }
\ No newline at end of file

--
Gitblit v1.8.0