From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
index 5c7373f..521317e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
@@ -4,6 +4,7 @@
 import java.util.List;
 
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
+import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
 import com.yeshi.fanli.entity.system.SystemCoupon;
 import com.yeshi.fanli.exception.user.UserSystemCouponException;
 import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
@@ -135,11 +136,6 @@
 	 */
 	public void insertUserCoupon(Long uid, String couponType, String source) throws UserSystemCouponException, Exception;
 
-	/**
-	 * 鍒稿凡杩囨湡鏇存柊
-	 * @param uid
-	 */
-	public void updateCounponInvalid(Long uid);
 
 	/**
 	 * 閫�鍥炲埜
@@ -237,12 +233,24 @@
 	 */
 	public String giveCoupon(Long uid, Long id) throws UserSystemCouponException;
 
+
 	/**
-	 * 鏇存柊璧犻�佽褰�
-	 * @param uid
+	 * 璧犻�侀��鍥�
 	 * @param id
-	 * @param couponType
 	 */
-	public void updateGiveRecord(Long uid, Long id, String couponType);
+	public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList);
+
+	/**
+	 * 鏌ヨ闇�瑕佽繃鏈熺殑
+	 * @param count
+	 * @return
+	 */
+	public List<UserSystemCoupon> getCounponNowInvalid(int count);
+
+	/**
+	 * 杩囨湡鍒�
+	 * @param list
+	 */
+	public void updateCounponInvalid(List<UserSystemCoupon> list);
 
 }

--
Gitblit v1.8.0