From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 a0ebf86..0a7d298 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
@@ -10,7 +10,6 @@
public interface UserSystemCouponMapper extends BaseMapper<UserSystemCoupon> {
-
List<UserSystemCoupon> getUserCouponList(@Param("start") long start, @Param("count") int count,
@Param("uid") Long uid);
@@ -59,6 +58,13 @@
List<UserSystemCoupon> getCounponNowInvalid(@Param("count")int count);
/**
+ * 鑾峰彇宸茬粡杩囨湡浣嗙姸鎬佹湭鏀瑰彉鐨勫埜
+ * @param uid
+ * @return
+ */
+ List<UserSystemCoupon> getCounponNowInvalidByUid(@Param("uid")Long uid);
+
+ /**
* 鏍规嵁鐘舵�佹煡璇㈠埜
* @param uid
* @param source
@@ -89,4 +95,40 @@
*/
List<UserSystemCouponVO> getIncludeNotExchange(@Param("uid") Long uid,@Param("num") int num, @Param("type") String type);
+
+ /**
+ * 鏌ヨ姝ｅ湪浣跨敤涓� 瓒呰繃鏃堕棿浠嶆湭鍖归厤鍒拌鍗曡褰�
+ * @param uid
+ * @param seconds
+ * @return
+ */
+ List<UserSystemCoupon> getCouponByUsingTimeOut(@Param("uid") Long uid,@Param("list") List<Long> list, @Param("number") Long number);
+
+
+ /**
+ * 缁熻鏈夋晥鍒�
+ * @param uid
+ * @param listCouponId
+ * @return
+ */
+ 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