From 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 九月 2019 16:58:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   15 +++++++++++++++
 1 files changed, 15 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 59f32e3..c8c7580 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
@@ -293,5 +293,20 @@
 	 * @return
 	 */
 	public long countUsableFreeCouponForBuy(Long uid);
+	
+	/**
+	 * 缁熻鍙娇鐢ㄧ殑濂栧姳鍒�
+	 * @param uid
+	 * @return
+	 */
+	public long countUsableRewardCoupon(Long uid);
+
+	/**
+	 * 鏌ヨ鍏嶅埜鏁伴噺
+	 * @param uid
+	 * @param type
+	 * @return
+	 */
+	public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type);
 
 }

--
Gitblit v1.8.0