From 3a6e476b2f498e876ff10f1328455f58e63ee85a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 四月 2019 09:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 26122a2..039d972 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.push.PushCoupon;
 import com.yeshi.fanli.entity.system.SystemCoupon;
 import com.yeshi.fanli.exception.user.UserSystemCouponException;
 import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
@@ -151,7 +152,7 @@
 	 * 婵�娲荤鍒╁厤鍗曞埜
 	 * @param uid
 	 */
-	public void activatedWelfareFreeCoupon(Long uid);
+	public void activatedWelfareFreeCoupon(Long uid, String from);
 
 	/**
 	 * 鏇存柊鍒歌褰� 鈥斺�斿尮閰嶅厤鍗曞埜
@@ -185,5 +186,21 @@
 	 * @throws Exception
 	 */
 	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception;
+
+	
+	/**
+	 * 棰嗗彇鍒�
+	 * @param uid
+	 * @throws Exception
+	 */
+	public void receivedCoupon(Long uid) throws Exception;
+	
+	/**
+	 * 鏍规嵁鎺ㄩ�� 鑾峰彇瀵瑰簲鐨勫埜
+	 * @param pushCoupon
+	 * @param uid
+	 * @throws Exception
+	 */
+	public void randomRewardCoupon(PushCoupon pushCoupon, Long uid) throws Exception;
 	
 }

--
Gitblit v1.8.0