From 3672aec5bf6c2c6da4cb7ab4a8b5f314a22c5831 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 19 八月 2019 17:32:00 +0800
Subject: [PATCH] 退回淘礼金

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java |  103 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java
index 2054efe..b25f3f7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java
@@ -1,5 +1,11 @@
 package com.yeshi.fanli.service.inter.msg;
 
+import java.math.BigDecimal;
+
+import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
 
 /**
@@ -29,7 +35,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void welfareCouponActive(UserSystemCoupon coupon);
+	public void welfareCouponActive(UserSystemCoupon coupon,UserInfo worker);
 
 	/**
 	 * 绂忓埄鍏嶅崟鍒镐娇鐢ㄤ腑
@@ -37,7 +43,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void welfareCouponUsing(UserSystemCoupon coupon);
+	public void welfareCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money);
 
 	/**
 	 * 绂忓埄鍏嶅崟鍒稿凡琚娇鐢�
@@ -46,7 +52,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void welfareCouponUsed(UserSystemCoupon coupon);
+	public void welfareCouponUsed(UserSystemCoupon coupon,String orderId);
 
 	/**
 	 * 绂忓埄鍏嶅崟鍒稿嵆灏嗚繃鏈�
@@ -60,10 +66,16 @@
 	/**
 	 * 绂忓埄鍏嶅崟鍒稿凡缁忚繃鏈�
 	 * 
-	 * @param startTime
-	 * @param endTime
+	 * @param coupon
 	 */
 	public void welfareCouponAlreadyOutOfDate(UserSystemCoupon coupon);
+	
+	
+	/**
+	 * 绂忓埄鍏嶅崟鍒稿凡缁忛��鍥�
+	 * @param coupon
+	 */
+	public void welfareCouponDrawBack(UserSystemCoupon coupon,String orderId);
 
 	// 鍏嶅崟鍒�
 
@@ -78,23 +90,13 @@
 	public void freeSheetCouponGet(UserSystemCoupon coupon);
 
 	/**
-	 * 鍏嶅崟鍒告縺娲�
-	 * 
-	 * @param leftDay
-	 * @param source
-	 * @param startTime
-	 * @param endTime
-	 */
-	public void freeSheetCouponActive(UserSystemCoupon coupon);
-
-	/**
 	 * 鍏嶅崟鍒告鍦ㄤ娇鐢�
 	 * 
 	 * @param source
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void freeSheetCouponUsing(UserSystemCoupon coupon);
+	public void freeSheetCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money);
 
 	/**
 	 * 鍏嶅崟鍒稿凡缁忎娇鐢�
@@ -104,7 +106,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void freeSheetCouponUsed(UserSystemCoupon coupon);
+	public void freeSheetCouponUsed(UserSystemCoupon coupon,String orderId);
 
 	/**
 	 * 鍏嶅崟鍒稿嵆灏嗚繃鏈�
@@ -124,38 +126,31 @@
 	 * @param endTime
 	 */
 	public void freeSheetCouponAlreadyOutOfDate(UserSystemCoupon coupon);
+	
+	/**
+	 * 宸查��鍥�
+	 * @param coupon
+	 */
+	public void freeSheetCouponDrawBack(UserSystemCoupon coupon,String orderId);
 
 	// 濂栧姳鍒�
 
-	/**
-	 * 濂栧姳鍒歌幏寰�
-	 * 
-	 * @param leftDay
-	 * @param source
-	 * @param startTime
-	 * @param endTime
-	 */
-	public void rewardCouponGet(UserSystemCoupon coupon);
 
 	/**
-	 * 濂栧姳鍒告縺娲�
-	 * 
-	 * @param leftDay
-	 * @param source
-	 * @param startTime
-	 * @param endTime
+	 *  濂栧姳鍒歌幏寰�
+	 * @param coupon
+	 * @param percent -鐧惧垎姣�
 	 */
-	public void rewardCouponActive(UserSystemCoupon coupon);
+	public void rewardCouponGet(UserSystemCoupon coupon,int percent);
+
 
 	/**
-	 * 濂栧姳鍒稿凡缁忎娇鐢�
-	 * 
-	 * @param leftDay
-	 * @param source
-	 * @param startTime
-	 * @param endTime
+	 * 濂栧姳鍒镐娇鐢ㄦ垚鍔�
+	 * @param coupon
+	 * @param oldFanLiMoney-鍘熷杩斿埄閲戦
+	 * @param rewardMoney-濂栧姳閲戦
 	 */
-	public void rewardCouponUsed(UserSystemCoupon coupon);
+	public void rewardCouponUsed(UserSystemCoupon coupon,BigDecimal oldFanLiMoney,BigDecimal rewardMoney,String orderId);
 
 	/**
 	 * 濂栧姳鍒稿嵆灏嗚繃鏈�
@@ -165,7 +160,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void rewardCouponWillOutOfDate(UserSystemCoupon coupon);
+	public void rewardCouponWillOutOfDate(UserSystemCoupon coupon,int percent);
 
 	/**
 	 * 濂栧姳鍒稿凡缁忚繃鏈�
@@ -176,4 +171,30 @@
 	 */
 	public void rewardCouponAlreadyOutOfDate(UserSystemCoupon coupon);
 
+
+	/**
+	 * 娣樼ぜ閲戞秷鎭�
+	 * @param uid
+	 * @param beiZhu
+	 * @param content
+	 */
+	public void taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO content);
+
+	
+	/**
+	 * 鍙ｄ护璧犻�侀鍙�
+	 * @param uid
+	 * @param beiZhu
+	 * @param content
+	 */
+	public void tokenGiveMsg(Long uid, String beiZhu, MsgOtherGiveContentDTO content);
+
+	/**
+	 * 鍏戞崲娑堟伅
+	 * @param uid
+	 * @param beiZhu
+	 * @param content
+	 */
+	public void exchangeMsg(Long uid, String beiZhu, MsgOtherExchangeContentDTO content);
+
 }

--
Gitblit v1.8.0