From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   10 ++++++++--
 1 files changed, 8 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 09f4a6b..4e36e7e 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
@@ -327,9 +327,15 @@
 	public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type);
 
 	/**
-	 * 婵�娲诲厤鍗曞埜---璁㈠崟宸插埌璐�      TODO 寰呰皟鐢�
+	 * 婵�娲诲厤鍗曞埜---璁㈠崟宸插埌璐�   瑙﹀彂婵�娲诲厤鍗曞埜
 	 * @param uid
 	 */
-	public void activateFreeCoupon(Long uid);
+	public void triggerFreeCouponActivate(Long uid);
+
+	/**
+	 * 閫�鍥炲埜
+	 * @param giveid
+	 */
+	public void sendBackByGiveId(Long giveid);
 
 }

--
Gitblit v1.8.0