From a481da100d823bdebc63ddd11ba23da2f84c38ca Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 21 八月 2019 10:43:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 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 6eeb35d..ba6730e 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
@@ -205,4 +205,43 @@
 	 */
 	public void randomRewardCoupon(int num, Long uid, String source) throws Exception;
 
+	/**
+	 * 娣诲姞鍒�
+	 * @param uid
+	 * @param couponType
+	 * @param source
+	 * @throws UserSystemCouponException
+	 */
+	public void exchangeCoupon(Long uid, String couponType, String source,
+			BigDecimal percent) throws UserSystemCouponException, Exception;
+
+	
+	/**
+	 * 鍒稿垪琛� 1.6.5
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @return
+	 * @throws UserSystemCouponException
+	 * @throws Exception
+	 */
+	public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid) throws UserSystemCouponException, Exception;
+
+	
+	/**
+	 * 璧犻�佸埜鐢熸垚鍙ｄ护
+	 * @param uid
+	 * @param id
+	 * @return
+	 * @throws UserSystemCouponException
+	 */
+	public String giveCoupon(Long uid, Long id) throws UserSystemCouponException;
+
+
+	/**
+	 * 璧犻�侀��鍥�
+	 * @param id
+	 */
+	public void sendBackGive(Long id);
+
 }

--
Gitblit v1.8.0