From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java | 143 ++++++++++++++++++++++++++++-------------------
1 files changed, 84 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..de5369c 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,85 @@
-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> 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
+ * @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<UserSystemCoupon> getIncludeExchange(@Param("uid") Long uid, @Param("list") List<String> list);
+
+
+ /**
+ * 鏌ヨ鎺掑嚭鍏戞崲鐨勫埜
+ * @param uid
+ * @param source
+ * @return
+ */
+ List<UserSystemCoupon> getIncludeNotExchange(@Param("uid") Long uid,@Param("list") List<String> list);
+
}
\ No newline at end of file
--
Gitblit v1.8.0