From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |  106 ++++++++++++++++++++++++++---------------------------
 1 files changed, 52 insertions(+), 54 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..c878760 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
@@ -7,6 +7,7 @@
 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.entity.system.SystemCoupon.CouponTypeEnum;
 import com.yeshi.fanli.exception.user.UserSystemCouponException;
 import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
 import com.yeshi.fanli.vo.user.UserSystemCouponVO;
@@ -127,15 +128,6 @@
 	 */
 	public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source);
 
-	/**
-	 * 鎻掑叆鍒镐俊鎭�
-	 * @param uid
-	 * @param couponType
-	 * @param source  鏉ユ簮
-	 * @throws UserSystemCouponException
-	 * @throws Exception
-	 */
-	public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,Boolean needNotify) throws UserSystemCouponException, Exception;
 
 
 	/**
@@ -144,11 +136,6 @@
 	 */
 	public void sendBackTimeOutCoupon(Long uid);
 
-	/**
-	 * 婵�娲荤鍒╁厤鍗曞埜
-	 * @param uid
-	 */
-	public void activatedWelfareFreeCoupon(Long uid, String from);
 
 	/**
 	 * 鏇存柊鍒歌褰� 鈥斺�斿尮閰嶅厤鍗曞埜
@@ -174,14 +161,6 @@
 	 */
 	public void updateStateByArrivalAccount(String orderNo) throws Exception;
 
-	/**
-	 * 棰嗗彇鏈櫥褰曟椂宸叉娊濂栫殑绀煎搧
-	 * @param uid
-	 * @param platform
-	 * @param device
-	 * @throws Exception
-	 */
-	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception;
 
 	
 
@@ -192,29 +171,6 @@
 	 * @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;
-	
-	
-	
-	
-	/**
-	 * 绯荤粺璧犻�佸鍔卞埜
-	 * @param num
-	 * @param uid
-	 * @param source
-	 * @throws Exception
-	 */
-	public void systemGiveRewardCoupon(Long uid,int num,String orderId,Integer orderType,String reason) throws Exception;
-	
-	
 	
 	
 
@@ -238,7 +194,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;
 
 	
 	/**
@@ -271,18 +227,12 @@
 	public void updateCounponInvalid(List<UserSystemCoupon> list);
 
 	/**
-	 * 鍏戞崲
+	 * 鏈夋晥濂栧姳鍒�
 	 * @param uid
 	 * @return
 	 */
-	public boolean getIncludeExchange(Long uid);
+	public boolean getValidRebateCoupon(Long uid);
 
-	/**
-	 * 闈炲厬鎹�
-	 * @param uid
-	 * @return
-	 */
-	public boolean getIncludeNotExchange(Long uid);
 
 	/**
 	 * 鏌ヨ1.6.5涔嬪墠鐨�  涓嶇瓑浜�35%
@@ -326,4 +276,52 @@
 	 */
 	public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type);
 
+	/**
+	 * 婵�娲诲厤鍗曞埜---璁㈠崟宸插埌璐�   瑙﹀彂婵�娲诲厤鍗曞埜
+	 * @param uid
+	 */
+	public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source);
+
+	/**
+	 * 閫�鍥炲埜
+	 * @param giveid
+	 */
+	public void sendBackByGiveId(Long giveid);
+
+	/**
+	 * 缁熻璧犻�佸厤鍗曞埜
+	 * @param uid
+	 * @return
+	 */
+	public long countGiveFreeCoupon(Long uid);
+
+	
+	/**
+	 * 鍏嶅崟鍒歌幏寰�
+	 * @param uid
+	 * @param typeEnum 绫诲瀷
+	 * @param source  鏉ユ簮
+	 * @param num     鏁伴噺
+	 * @param notify  鏄惁鍙戦�佹秷鎭�
+	 * @return
+	 * @throws UserSystemCouponException
+	 */
+	public UserSystemCoupon freeCouponWin(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify)
+			throws UserSystemCouponException, Exception;
+
+	/**
+	 * 濂栧姳鍒稿埜鑾峰緱
+	 * @param uid
+	 * @param typeEnum
+	 * @param source
+	 * @param num
+	 * @param notify
+	 * @param percent
+	 * @return
+	 * @throws UserSystemCouponException
+	 * @throws Exception
+	 */
+	public UserSystemCoupon rewardCouponWin(Long uid, String source, int num, boolean notify,
+			BigDecimal percent) throws UserSystemCouponException, Exception;
+
 }

--
Gitblit v1.8.0