From 52c6d1a36c708d5047ca7b44a418c00793b90a73 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 28 八月 2019 15:05:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |    9 +++++++++
 1 files changed, 9 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 7c756f8..b0c56aa 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
@@ -267,4 +267,13 @@
 	 */
 	public boolean getIncludeNotExchange(Long uid);
 
+	/**
+	 * 鏌ヨ1.6.5涔嬪墠鐨�  涓嶇瓑浜�35%
+	 * @param uid
+	 * @return
+	 */
+	public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception;
+
+	public long countCouponOld(Long uid);
+
 }

--
Gitblit v1.8.0