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 |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 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 a0dfe26..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,8 +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;
 
@@ -187,4 +189,28 @@
 	 * @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