From be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   14 +-------------
 1 files changed, 1 insertions(+), 13 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 23107a4..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
@@ -163,18 +163,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
 	 * @param start
@@ -327,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