From ad3119f7b7e0375a8363b900346284bb1c274a3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 12:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java |   14 ++++++++++++++
 1 files changed, 14 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 9396114..3ac54ed 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
@@ -35,6 +35,20 @@
 	 */
 	List<UserSystemCoupon> getUserCouponBySource(@Param("uid") Long uid, @Param("source") String source);
 	
+	/**
+	 * 鑾峰彇宸茬粡杩囨湡浣嗙姸鎬佹湭鏀瑰彉鐨勫埜
+	 * @param uid
+	 * @return
+	 */
+	List<UserSystemCoupon> getCounponNowInvalid(@Param("uid") Long uid);
+	
+	/**
+	 * 鏍规嵁鐘舵�佹煡璇㈠埜
+	 * @param uid
+	 * @param source
+	 * @return
+	 */
+	List<UserSystemCoupon> getCouponByState(@Param("uid") Long uid, @Param("state") String state);
 	
 	
 }
\ No newline at end of file

--
Gitblit v1.8.0