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 | 185 +++++++++++++++++++++++++++++++--------------
1 files changed, 126 insertions(+), 59 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 ddba640..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
@@ -1,60 +1,127 @@
-package com.yeshi.fanli.dao.mybatis.user;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
-import com.yeshi.fanli.vo.user.UserSystemCouponVO;
-
-public interface UserSystemCouponMapper extends BaseMapper<UserSystemCoupon> {
-
- /**
- * 婵�娲诲埜
- * @param couponId
- */
- void activateCouponByType(@Param("uid") Long uid, @Param("couponId") Long couponId);
-
- List<UserSystemCoupon> getUserCouponList(@Param("start") long start, @Param("count") int count,
- @Param("uid") Long uid);
-
- List<UserSystemCouponVO> getUserCouponVOList(@Param("start") long start, @Param("count") int count,
- @Param("uid") Long uid);
-
- long countUserCouponList(@Param("uid") Long uid);
-
- /**
- * 鏍规嵁鍒竔d鏌ヨ鍙娇鐢ㄥ埜
- * @param uid
- * @param typeList
- * @return
- */
- List<UserSystemCouponVO> getEnableListByCouponId(@Param("uid") Long uid, @Param("activated") Integer activated,
- @Param("list") List<Long> listCouponId);
-
- /**
- * 鏍规嵁鏉ユ簮鏌ヨ璁㈠崟
- * @param uid
- * @param source
- * @return
- */
- 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);
-
-
+package com.yeshi.fanli.dao.mybatis.user;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
+import com.yeshi.fanli.vo.user.UserSystemCouponVO;
+
+public interface UserSystemCouponMapper extends BaseMapper<UserSystemCoupon> {
+
+ List<UserSystemCoupon> getUserCouponList(@Param("start") long start, @Param("count") int count,
+ @Param("uid") Long uid);
+
+
+ List<UserSystemCouponVO> getCouponListOld(@Param("start") long start, @Param("count") int count,
+ @Param("uid") Long uid);
+
+ long countCouponOld(@Param("uid") Long uid);
+
+
+ List<UserSystemCouponVO> getUserCouponVOList(@Param("start") long start, @Param("count") int count,
+ @Param("uid") Long uid);
+
+ long countUserCouponList(@Param("uid") Long uid);
+
+ /**
+ * 鏍规嵁鍒竔d鏌ヨ鍙娇鐢ㄥ埜
+ * @param uid
+ * @param typeList
+ * @return
+ */
+ List<UserSystemCouponVO> getEnableListByCouponId(@Param("uid") Long uid, @Param("activated") Integer activated,
+ @Param("list") List<Long> listCouponId);
+
+ /**
+ * 鏍规嵁鏉ユ簮鏌ヨ璁㈠崟
+ * @param uid
+ * @param source
+ * @return
+ */
+ List<UserSystemCoupon> getUserCouponBySource(@Param("uid") Long uid, @Param("source") String source);
+
+ /**
+ * 鏍规嵁鏉ユ簮鏌ヨ璁㈠崟
+ * @param uid
+ * @param source
+ * @return
+ */
+ int countTodatyUserCouponBySource(@Param("uid") Long uid, @Param("source") String source);
+
+ /**
+ * 鑾峰彇宸茬粡杩囨湡浣嗙姸鎬佹湭鏀瑰彉鐨勫埜
+ * @param uid
+ * @return
+ */
+ List<UserSystemCoupon> getCounponNowInvalid(@Param("count")int count);
+
+ /**
+ * 鑾峰彇宸茬粡杩囨湡浣嗙姸鎬佹湭鏀瑰彉鐨勫埜
+ * @param uid
+ * @return
+ */
+ List<UserSystemCoupon> getCounponNowInvalidByUid(@Param("uid")Long uid);
+
+ /**
+ * 鏍规嵁鐘舵�佹煡璇㈠埜
+ * @param uid
+ * @param source
+ * @return
+ */
+ List<UserSystemCoupon> getCouponByState(@Param("uid") Long uid, @Param("state") String state);
+
+ /**
+ * 鏌ヨ娌℃湁婵�娲荤殑鍒�
+ * @param couponId
+ */
+ List<UserSystemCoupon> getCouponByTypeAndNotActivated(@Param("uid") Long uid, @Param("couponId") Long couponId);
+
+
+
+ /**
+ * 鏍规嵁绫诲瀷鏌ヨ鏈夋晥鍒�
+ * @param uid
+ * @param source
+ * @return
+ */
+ List<UserSystemCouponVO> getValidByUidAndType(@Param("uid") Long uid, @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