From e021e32a6ff0ec216f69c24f7ea929798bdce4c5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 11:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 cde6d36..0f671f5 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
@@ -238,7 +238,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid) throws UserSystemCouponException, Exception;
+	public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid) throws UserSystemCouponException, Exception;
 
 	
 	/**
@@ -326,4 +326,10 @@
 	 */
 	public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type);
 
+	/**
+	 * 婵�娲诲厤鍗曞埜---璁㈠崟宸插埌璐�   瑙﹀彂婵�娲诲厤鍗曞埜
+	 * @param uid
+	 */
+	public void triggerFreeCouponActivate(Long uid);
+
 }

--
Gitblit v1.8.0