From 0b0a5ccd1f42342a3ec7e2e2bbe74bfad4fe066e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 16:59:36 +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 |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 521317e..7c756f8 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
@@ -134,7 +134,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public void insertUserCoupon(Long uid, String couponType, String source) throws UserSystemCouponException, Exception;
+	public void insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception;
 
 
 	/**
@@ -231,7 +231,7 @@
 	 * @return
 	 * @throws UserSystemCouponException
 	 */
-	public String giveCoupon(Long uid, Long id) throws UserSystemCouponException;
+	public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException;
 
 
 	/**
@@ -253,4 +253,18 @@
 	 */
 	public void updateCounponInvalid(List<UserSystemCoupon> list);
 
+	/**
+	 * 鍏戞崲
+	 * @param uid
+	 * @return
+	 */
+	public boolean getIncludeExchange(Long uid);
+
+	/**
+	 * 闈炲厬鎹�
+	 * @param uid
+	 * @return
+	 */
+	public boolean getIncludeNotExchange(Long uid);
+
 }

--
Gitblit v1.8.0