From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 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 8dc719a..8e25c87 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
@@ -138,23 +138,21 @@
 	 * @return           鍏嶅崟鎴愬姛 true 
 	 * @throws Exception
 	 */
-	public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId) throws  Exception;
+	public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
+			Long auctionId  , Integer sourceType) throws  Exception;
 
 	/**
 	 * 璁㈠崟閫�娆炬洿鏂� 鍒歌褰曠姸鎬佸苟閫�鍥炲埜
 	 * @param orderNo
 	 */
-	public void updateStateByDrawback(String orderNo) throws Exception;
+	public void updateStateByDrawback(String orderNo, Integer sourceType) throws Exception;
 
 	/**
 	 * 绾㈠寘鍒拌处 -- 鏇存柊鍒镐娇鐢ㄧ姸鎬� -鏀逛负浣跨敤鎴愬姛
 	 * @param orderNo
 	 * @throws Exception
 	 */
-	public void updateStateByArrivalAccount(String orderNo) throws Exception;
-
-
-	
+	public void updateStateByArrivalAccount(String orderNo, Integer sourceType) throws Exception;
 
 	/**
 	 * 缁熻浠婃棩鎶藉涓殑鍒告暟閲�
@@ -164,18 +162,6 @@
 	 */
 	public int countTodatyUserCouponBySource(Long uid, String source);
 	
-	
-
-	/**
-	 * 娣诲姞鍒�
-	 * @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
@@ -329,7 +315,7 @@
 	 * @throws Exception
 	 */
 	public UserSystemCoupon freeCouponWinBySystem(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify,
-			Integer expiryDay) throws UserSystemCouponException, Exception;
+			Integer expiryDay, Integer activated) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鑾峰彇鏈夋晥鍏嶅崟鍒稿垪琛�

--
Gitblit v1.8.0