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

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 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 9a24d68..6e07585 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
@@ -253,4 +253,33 @@
 	 */
 	public void updateCounponInvalid(List<UserSystemCoupon> list);
 
+	/**
+	 * 鍏戞崲
+	 * @param uid
+	 * @return
+	 */
+	public boolean getIncludeExchange(Long uid);
+
+	/**
+	 * 闈炲厬鎹�
+	 * @param uid
+	 * @return
+	 */
+	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);
+
+	/**
+	 * 鏇存柊鐢ㄦ埛杩囨湡鍒�
+	 * @param uid
+	 */
+	public void updateInvalidSate(Long uid);
+
 }

--
Gitblit v1.8.0