From 9d401723afe4fd680f60f97b8d927efea6344a6f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 14:54:22 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   20 +++++++++++++++++++-
 1 files changed, 19 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 bd519fd..9b2c927 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
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.inter.user;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
@@ -144,7 +145,24 @@
 	 * 閫�鍥炲埜
 	 * @param uid
 	 */
-	public void sendBackCoupon(Long uid);
+	public void sendBackTimeOutCoupon(Long uid);
+
+	/**
+	 * 婵�娲荤鍒╁厤鍗曞埜
+	 * @param uid
+	 */
+	public void activatedWelfareFreeCoupon(Long uid);
+
+	/**
+	 * 鏇存柊鍒歌褰� 鈥斺�斿尮閰嶅厤鍗曞埜
+	 * @param uid        鐢ㄦ埛id
+	 * @param orderNo    璁㈠崟鍙�
+	 * @param payment    浠樻閲戦
+	 * @param auctionId  鍟嗗搧id(娣樺疂)
+	 * @return           鍏嶅崟鎴愬姛 true 
+	 * @throws Exception
+	 */
+	public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId) throws  Exception;
 
 	
 }

--
Gitblit v1.8.0