From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 26 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 c878760..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
@@ -67,14 +67,6 @@
 	 */
 	public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception;
 
-	/**
-	 * 鏌ヨ鍟嗗搧浣跨敤鐩稿叧鍒�
-	 * @param uid
-	 * @return
-	 * @throws UserSystemCouponException
-	 * @throws Exception
-	 */
-	public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鏇存柊鍒镐娇鐢ㄨ褰�
@@ -146,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;
 
 	/**
 	 * 缁熻浠婃棩鎶藉涓殑鍒告暟閲�
@@ -172,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
@@ -324,4 +302,28 @@
 	public UserSystemCoupon rewardCouponWin(Long uid, String source, int num, boolean notify,
 			BigDecimal percent) throws UserSystemCouponException, Exception;
 
+	/**
+	 * 鍏嶅崟鍒歌幏寰�
+	 * @param uid
+	 * @param typeEnum
+	 * @param source
+	 * @param num
+	 * @param notify
+	 * @param expiryDay
+	 * @return
+	 * @throws UserSystemCouponException
+	 * @throws Exception
+	 */
+	public UserSystemCoupon freeCouponWinBySystem(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify,
+			Integer expiryDay, Integer activated) throws UserSystemCouponException, Exception;
+
+	/**
+	 * 鑾峰彇鏈夋晥鍏嶅崟鍒稿垪琛�
+	 * @param uid
+	 * @return
+	 */
+	public List<UserSystemCouponVO> getFreeCouponList(Long uid);
+
+	public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception;
+
 }

--
Gitblit v1.8.0