From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 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..3d4857d 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
@@ -271,18 +271,12 @@
 	public void updateCounponInvalid(List<UserSystemCoupon> list);
 
 	/**
-	 * 鍏戞崲
+	 * 鏈夋晥濂栧姳鍒�
 	 * @param uid
 	 * @return
 	 */
-	public boolean getIncludeExchange(Long uid);
+	public boolean getValidRebateCoupon(Long uid);
 
-	/**
-	 * 闈炲厬鎹�
-	 * @param uid
-	 * @return
-	 */
-	public boolean getIncludeNotExchange(Long uid);
 
 	/**
 	 * 鏌ヨ1.6.5涔嬪墠鐨�  涓嶇瓑浜�35%
@@ -327,9 +321,22 @@
 	public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type);
 
 	/**
-	 * 婵�娲诲厤鍗曞埜---璁㈠崟宸插埌璐�      TODO 寰呰皟鐢�
+	 * 婵�娲诲厤鍗曞埜---璁㈠崟宸插埌璐�   瑙﹀彂婵�娲诲厤鍗曞埜
 	 * @param uid
 	 */
-	public void activateFreeCoupon(Long uid);
+	public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source);
+
+	/**
+	 * 閫�鍥炲埜
+	 * @param giveid
+	 */
+	public void sendBackByGiveId(Long giveid);
+
+	/**
+	 * 缁熻璧犻�佸厤鍗曞埜
+	 * @param uid
+	 * @return
+	 */
+	public long countGiveFreeCoupon(Long uid);
 
 }

--
Gitblit v1.8.0