From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 cdde36a..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);
/**
@@ -122,4 +115,13 @@
*/
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