From 0272ffc3e7037e10c2ddadeea6c597850903878f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 30 八月 2019 14:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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..af891a1 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
@@ -134,7 +134,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public void insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception;
+	public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception;
 
 
 	/**
@@ -267,4 +267,24 @@
 	 */
 	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);
+
+	/*
+	 * 璧犻�佸埜
+	 */
+	public void sendBackGiveUser(Long uid);
+
 }

--
Gitblit v1.8.0