From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 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 eaf216f..f03b726 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
@@ -80,7 +80,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception;
+	public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType) throws UserSystemCouponException, Exception;
 	
 	
 	/**
@@ -90,7 +90,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception;
+	public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鏍规嵁璁㈠崟鍙疯幏鍙栧鍔卞埜浣跨敤杩涘害
@@ -99,7 +99,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo) throws UserSystemCouponException, Exception;
+	public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鏄惁瀛樺湪濂栧姳鍒�
@@ -115,7 +115,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception;
+	public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鏍规嵁璁㈠崟鏉ユ簮鏌ヨ
@@ -187,13 +187,6 @@
 	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception;
 
 	
-	/**
-	 * 棰嗗彇鍒�
-	 * @param uid
-	 * @throws Exception
-	 */
-	public void receivedCoupon(Long uid) throws Exception;
-	
 
 	/**
 	 * 缁熻浠婃棩鎶藉涓殑鍒告暟閲�
@@ -211,5 +204,37 @@
 	 * @throws Exception
 	 */
 	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;
+
 }

--
Gitblit v1.8.0