From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +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, 14 insertions(+), 5 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 039d972..eaf216f 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,7 +4,6 @@
 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;
@@ -36,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;
 
 	/**
 	 * 缁熻鏁伴噺
@@ -195,12 +194,22 @@
 	 */
 	public void receivedCoupon(Long uid) throws Exception;
 	
+
 	/**
-	 * 鏍规嵁鎺ㄩ�� 鑾峰彇瀵瑰簲鐨勫埜
-	 * @param pushCoupon
+	 * 缁熻浠婃棩鎶藉涓殑鍒告暟閲�
 	 * @param uid
+	 * @param source
+	 * @return
+	 */
+	public int countTodatyUserCouponBySource(Long uid, String source);
+
+	/**
+	 * 闅忔満鐢熸垚濂栧姳鍒�
+	 * @param num
+	 * @param uid
+	 * @param source
 	 * @throws Exception
 	 */
-	public void randomRewardCoupon(PushCoupon pushCoupon, Long uid) throws Exception;
+	public void randomRewardCoupon(int num, Long uid, String source) throws Exception;
 	
 }

--
Gitblit v1.8.0