From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 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 7fc6f17..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);
/**
@@ -114,4 +107,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