From 0272ffc3e7037e10c2ddadeea6c597850903878f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 30 八月 2019 14:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java |    9 ++++++++-
 1 files changed, 8 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 3c733d8..a02ebfd 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);
 	
@@ -96,4 +95,12 @@
 	 */
 	List<UserSystemCouponVO> getIncludeNotExchange(@Param("uid") Long uid,@Param("num") int num, @Param("type") String type);
 	
+	
+	/**
+	 * 鏌ヨ姝e湪浣跨敤涓� 瓒呰繃鏃堕棿浠嶆湭鍖归厤鍒拌鍗曡褰�
+	 * @param uid
+	 * @param seconds
+	 * @return
+	 */
+	List<UserSystemCoupon> getCouponByUsingTimeOut(@Param("uid") Long uid,@Param("list") List<Long> list, @Param("number") Long number);
 }
\ No newline at end of file

--
Gitblit v1.8.0