From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java |   82 +++++++++++++++++++++++++++++++----------
 1 files changed, 62 insertions(+), 20 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 1219fca..93b3734 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
@@ -2,6 +2,10 @@
 
 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.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
 
@@ -93,7 +97,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void freeSheetCouponUsing(UserSystemCoupon coupon);
+	public void freeSheetCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money);
 
 	/**
 	 * 鍏嶅崟鍒稿凡缁忎娇鐢�
@@ -103,7 +107,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void freeSheetCouponUsed(UserSystemCoupon coupon);
+	public void freeSheetCouponUsed(UserSystemCoupon coupon,String orderId);
 
 	/**
 	 * 鍏嶅崟鍒稿嵆灏嗚繃鏈�
@@ -128,29 +132,26 @@
 	 * 宸查��鍥�
 	 * @param coupon
 	 */
-	public void freeSheetCouponDrawBack(UserSystemCoupon 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 rewardCouponUsed(UserSystemCoupon coupon);
+	public void rewardCouponGet(UserSystemCoupon coupon,int percent);
+
+
+	/**
+	 * 濂栧姳鍒镐娇鐢ㄦ垚鍔�
+	 * @param coupon
+	 * @param oldFanLiMoney-鍘熷杩斿埄閲戦
+	 * @param rewardMoney-濂栧姳閲戦
+	 */
+	public void rewardCouponUsed(UserSystemCoupon coupon,BigDecimal oldFanLiMoney,BigDecimal rewardMoney,String orderId);
 
 	/**
 	 * 濂栧姳鍒稿嵆灏嗚繃鏈�
@@ -160,7 +161,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public void rewardCouponWillOutOfDate(UserSystemCoupon coupon);
+	public void rewardCouponWillOutOfDate(UserSystemCoupon coupon,int percent);
 
 	/**
 	 * 濂栧姳鍒稿凡缁忚繃鏈�
@@ -171,4 +172,45 @@
 	 */
 	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);
+
+	/**
+	 * 鍒搁��鍥�
+	 * @param coupon
+	 * @param orderId
+	 * @param type
+	 */
+	public void couponDrawBack(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type);
+
+	/**
+	 * 鍒�
+	 * @param coupon
+	 * @param type
+	 */
+	public void outOfDate(UserSystemCoupon coupon, MsgTypeOtherTypeEnum type);
+
 }

--
Gitblit v1.8.0