From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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..3d1a762 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
@@ -35,7 +35,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid) throws UserSystemCouponException, Exception;
+	public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump ) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 缁熻鏁伴噺
@@ -151,7 +151,7 @@
 	 * 婵�娲荤鍒╁厤鍗曞埜
 	 * @param uid
 	 */
-	public void activatedWelfareFreeCoupon(Long uid);
+	public void activatedWelfareFreeCoupon(Long uid, String from);
 
 	/**
 	 * 鏇存柊鍒歌褰� 鈥斺�斿尮閰嶅厤鍗曞埜
@@ -185,5 +185,24 @@
 	 * @throws Exception
 	 */
 	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception;
+
 	
+
+	/**
+	 * 缁熻浠婃棩鎶藉涓殑鍒告暟閲�
+	 * @param uid
+	 * @param source
+	 * @return
+	 */
+	public int countTodatyUserCouponBySource(Long uid, String source);
+
+	/**
+	 * 闅忔満鐢熸垚濂栧姳鍒�
+	 * @param num
+	 * @param uid
+	 * @param source
+	 * @throws Exception
+	 */
+	public void randomRewardCoupon(int num, Long uid, String source) throws Exception;
+
 }

--
Gitblit v1.8.0