From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 11 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 59f32e3..3d4857d 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
@@ -3,6 +3,7 @@
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
 import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
 import com.yeshi.fanli.entity.system.SystemCoupon;
@@ -91,7 +92,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType) throws UserSystemCouponException, Exception;
+	public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鏍规嵁璁㈠崟鍙疯幏鍙栧鍔卞埜浣跨敤杩涘害
@@ -134,7 +135,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception;
+	public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,Boolean needNotify) throws UserSystemCouponException, Exception;
 
 
 	/**
@@ -200,6 +201,22 @@
 	 * @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;
+	
+	
+	
+	
 
 	/**
 	 * 娣诲姞鍒�
@@ -221,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;
 
 	
 	/**
@@ -254,18 +271,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%
@@ -293,5 +304,39 @@
 	 * @return
 	 */
 	public long countUsableFreeCouponForBuy(Long uid);
+	
+	/**
+	 * 缁熻鍙娇鐢ㄧ殑濂栧姳鍒�
+	 * @param uid
+	 * @return
+	 */
+	public long countUsableRewardCoupon(Long uid);
+
+	/**
+	 * 鏌ヨ鍏嶅埜鏁伴噺
+	 * @param uid
+	 * @param type
+	 * @return
+	 */
+	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);
 
 }

--
Gitblit v1.8.0