From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +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 |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 af891a1..b8f30a7 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
@@ -287,4 +287,18 @@
 	 */
 	public void sendBackGiveUser(Long uid);
 
+	/**
+	 * 缁熻鍙娇鐢ㄧ殑鍏嶅崟鍒�
+	 * @param uid
+	 * @return
+	 */
+	public long countUsableFreeCouponForBuy(Long uid);
+	
+	/**
+	 * 缁熻鍙娇鐢ㄧ殑濂栧姳鍒�
+	 * @param uid
+	 * @return
+	 */
+	public long countUsableRewardCoupon(Long uid);
+
 }

--
Gitblit v1.8.0