From 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 18:24:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 9b2c927..e38c242 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
@@ -71,7 +71,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception;
+	public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鏇存柊鍒镐娇鐢ㄨ褰�
@@ -164,5 +164,17 @@
 	 */
 	public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId) throws  Exception;
 
+	/**
+	 * 璁㈠崟閫�娆炬洿鏂� 鍒歌褰曠姸鎬佸苟閫�鍥炲埜
+	 * @param orderNo
+	 */
+	public void updateStateByDrawback(String orderNo) throws Exception;
+
+	/**
+	 * 绾㈠寘鍒拌处 -- 鏇存柊鍒镐娇鐢ㄧ姸鎬� -鏀逛负浣跨敤鎴愬姛
+	 * @param orderNo
+	 * @throws Exception
+	 */
+	public void updateStateByArrivalAccount(String orderNo) throws Exception;
 	
 }

--
Gitblit v1.8.0