From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 4 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 aca0226..3d1a762 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;
@@ -34,7 +35,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid) throws UserSystemCouponException, Exception;
+	public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump ) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 缁熻鏁伴噺
@@ -70,7 +71,7 @@
 	 * @throws UserSystemCouponException
 	 * @throws Exception
 	 */
-	public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception;
+	public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception;
 
 	/**
 	 * 鏇存柊鍒镐娇鐢ㄨ褰�
@@ -144,13 +145,64 @@
 	 * 閫�鍥炲埜
 	 * @param uid
 	 */
-	public void sendBackCoupon(Long uid);
+	public void sendBackTimeOutCoupon(Long uid);
 
 	/**
 	 * 婵�娲荤鍒╁厤鍗曞埜
 	 * @param uid
 	 */
-	public void activatedWelfareFreeCoupon(Long uid);
+	public void activatedWelfareFreeCoupon(Long uid, String from);
+
+	/**
+	 * 鏇存柊鍒歌褰� 鈥斺�斿尮閰嶅厤鍗曞埜
+	 * @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;
+
+	/**
+	 * 璁㈠崟閫�娆炬洿鏂� 鍒歌褰曠姸鎬佸苟閫�鍥炲埜
+	 * @param orderNo
+	 */
+	public void updateStateByDrawback(String orderNo) throws Exception;
+
+	/**
+	 * 绾㈠寘鍒拌处 -- 鏇存柊鍒镐娇鐢ㄧ姸鎬� -鏀逛负浣跨敤鎴愬姛
+	 * @param orderNo
+	 * @throws Exception
+	 */
+	public void updateStateByArrivalAccount(String orderNo) throws Exception;
+
+	/**
+	 * 棰嗗彇鏈櫥褰曟椂宸叉娊濂栫殑绀煎搧
+	 * @param uid
+	 * @param platform
+	 * @param device
+	 * @throws Exception
+	 */
+	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception;
 
 	
+
+	/**
+	 * 缁熻浠婃棩鎶藉涓殑鍒告暟閲�
+	 * @param uid
+	 * @param source
+	 * @return
+	 */
+	public int countTodatyUserCouponBySource(Long uid, String source);
+
+	/**
+	 * 闅忔満鐢熸垚濂栧姳鍒�
+	 * @param num
+	 * @param uid
+	 * @param source
+	 * @throws Exception
+	 */
+	public void randomRewardCoupon(int num, Long uid, String source) throws Exception;
+
 }

--
Gitblit v1.8.0