From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java |   17 +++++------------
 1 files changed, 5 insertions(+), 12 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 018184f..9f2b4f8 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
@@ -78,22 +78,15 @@
 	 */
 	List<UserSystemCoupon> getCouponByTypeAndNotActivated(@Param("uid") Long uid, @Param("couponId") Long couponId);
 	
+	
+	
 	/**
-	 *  鏌ヨ鍏戞崲鐨勫埜
+	 *  鏍规嵁绫诲瀷鏌ヨ鏈夋晥鍒�
 	 * @param uid
 	 * @param source
 	 * @return
 	 */
-	List<UserSystemCoupon> getIncludeExchange(@Param("uid") Long uid, @Param("num") int num, @Param("type") String type);
-	
-	
-	/**
-	 *  鏌ヨ鎺掑嚭鍏戞崲鐨勫埜
-	 * @param uid
-	 * @param source
-	 * @return
-	 */
-	List<UserSystemCouponVO> getIncludeNotExchange(@Param("uid") Long uid,@Param("num") int num, @Param("type") String type);
+	List<UserSystemCouponVO> getValidByUidAndType(@Param("uid") Long uid, @Param("type") String type);
 	
 	
 	/**
@@ -129,6 +122,6 @@
 	 * @param source
 	 * @return
 	 */
-	List<UserSystemCoupon> getNeedActivateFreeCouponByType(@Param("uid") Long uid, @Param("type") String type);
+	UserSystemCoupon getNeedActivateCouponByType(@Param("uid") Long uid, @Param("type") String type);
 	
 }
\ No newline at end of file

--
Gitblit v1.8.0