From dc675e0c19849b1d1a77c64f0b5c6a25eb91ace2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 七月 2019 10:50:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java
index 11d8152..268ff31 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java
@@ -1,31 +1,49 @@
-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.UserSystemCouponRecord;
-
-public interface UserSystemCouponRecordMapper extends BaseMapper<UserSystemCouponRecord> {
-
- /**
- * 鏍规嵁鍗曚釜璁㈠崟鏌ヨ
- * @param uid
- * @param activated
- * @param listCouponId
- * @return
- */
- UserSystemCouponRecord getRecordByOrderNo(@Param("orderNo") String orderNo, @Param("state") Integer state);
-
-
- /**
- * 鏍规嵁璁㈠崟鍙峰垪琛ㄦ煡璇�
- * @param uid
- * @param activated
- * @param listCouponId
- * @return
- */
- List<UserSystemCouponRecord> getRecordByOrderNoList(@Param("list") List<String> list);
-
+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.UserSystemCouponRecord;
+
+public interface UserSystemCouponRecordMapper extends BaseMapper<UserSystemCouponRecord> {
+
+ /**
+ * 鏍规嵁鍗曚釜璁㈠崟鏌ヨ
+ * @param uid
+ * @param activated
+ * @param listCouponId
+ * @return
+ */
+ List<UserSystemCouponRecord> getRecordByState(@Param("uid") Long uid, @Param("state") Integer state);
+
+ /**
+ * 鏍规嵁鍗曚釜璁㈠崟鏌ヨ
+ * @param uid
+ * @param activated
+ * @param listCouponId
+ * @return
+ */
+ UserSystemCouponRecord getRecordByOrderNo(@Param("orderNo") String orderNo, @Param("state") Integer state);
+
+
+ /**
+ * 鏍规嵁璁㈠崟鍙峰垪琛ㄦ煡璇�
+ * @param uid
+ * @param activated
+ * @param listCouponId
+ * @return
+ */
+ List<UserSystemCouponRecord> getRecordByOrderNoList( @Param("source")Integer source, @Param("list") List<String> list);
+
+
+ /**
+ * 鏌ヨ姝ｅ湪浣跨敤涓� 瓒呰繃鏃堕棿浠嶆湭鍖归厤鍒拌鍗曡褰�
+ * @param uid
+ * @param seconds
+ * @return
+ */
+ List<UserSystemCouponRecord> getCouponByUsingTimeOut(@Param("uid") Long uid, @Param("number") Long number);
+
}
\ No newline at end of file
--
Gitblit v1.8.0