From ad3119f7b7e0375a8363b900346284bb1c274a3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 12:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 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 47fd146..bd519fd 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
@@ -9,6 +9,7 @@
 import com.yeshi.fanli.vo.user.UserSystemCouponVO;
 
 public interface UserSystemCouponService {
+	
 	public int insertSelective(UserSystemCoupon record);
 
 	public UserSystemCoupon selectByPrimaryKey(Long id);
@@ -74,7 +75,7 @@
 	/**
 	 * 鏇存柊鍒镐娇鐢ㄨ褰�
 	 * @param uid
-	 * @param id
+	 * @param id 
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
@@ -115,5 +116,35 @@
 	 */
 	public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception;
 
+	/**
+	 * 鏍规嵁璁㈠崟鏉ユ簮鏌ヨ
+	 * @param uid
+	 * @param source
+	 * @return
+	 */
+	public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source);
+
+	/**
+	 * 鎻掑叆鍒镐俊鎭�
+	 * @param uid
+	 * @param couponType
+	 * @param source  鏉ユ簮
+	 * @throws UserSystemCouponException
+	 * @throws Exception
+	 */
+	public void insertUserCoupon(Long uid, String couponType, String source) throws UserSystemCouponException, Exception;
+
+	/**
+	 * 鍒稿凡杩囨湡鏇存柊
+	 * @param uid
+	 */
+	public void updateCounponInvalid(Long uid);
+
+	/**
+	 * 閫�鍥炲埜
+	 * @param uid
+	 */
+	public void sendBackCoupon(Long uid);
+
 	
 }

--
Gitblit v1.8.0