From b7a90c576ac6b482c68ad6d0c2777831f9127b4a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 19 五月 2020 16:48:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java | 306 ++++++++------------------------------------------
1 files changed, 49 insertions(+), 257 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 61ccef9..4e6430f 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,17 +1,6 @@
package com.yeshi.fanli.service.inter.msg;
-import java.math.BigDecimal;
-
-import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherVIPDTO;
-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;
+import java.util.Date;
/**
* 鐢ㄦ埛璁㈠崟娑堟伅閫氱煡
@@ -20,285 +9,88 @@
*
*/
public interface UserOtherMsgNotificationService {
-
- // 绂忓埄濂栧姳鍒�
-
+
/**
- * 鑾峰緱绂忓埄鍏嶅崟鍒�
- *
- * @param leftDay
+ * 鍏嶅崟鍒告秷鎭� - 鎴愬姛鑾峰緱/婵�娲绘垚鍔�/浣跨敤閫�鍥�
+ * @param uid
+ * @param name
* @param source
+ * @param num
+ * @param stateDesc
* @param startTime
* @param endTime
*/
- public void welfareCouponGet(UserSystemCoupon coupon);
+ public void freeCouponWinMsg(Long uid, String name, String source, int num, String stateDesc, Date startTime,
+ Date endTime);
/**
- * 绂忓埄鍏嶅崟鍒告縺娲�
- *
- * @param leftDay
- * @param startTime
- * @param endTime
- */
- public void welfareCouponActive(UserSystemCoupon coupon, UserInfo worker);
-
- /**
- * 绂忓埄鍏嶅崟鍒镐娇鐢ㄤ腑
- *
- * @param startTime
- * @param endTime
- */
- public void welfareCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money);
-
- /**
- * 绂忓埄鍏嶅崟鍒稿凡琚娇鐢�
- *
- * @param leftDay
- * @param startTime
- * @param endTime
- */
- public void welfareCouponUsed(UserSystemCoupon coupon, String orderId);
-
- /**
- * 绂忓埄鍏嶅崟鍒稿嵆灏嗚繃鏈�
- *
- * @param leftDay
- * @param startTime
- * @param endTime
- */
- public void welfareCouponWillOutOfDate(UserSystemCoupon coupon);
-
- /**
- * 绂忓埄鍏嶅崟鍒稿凡缁忚繃鏈�
- *
- * @param coupon
- */
- public void welfareCouponAlreadyOutOfDate(UserSystemCoupon coupon);
-
- /**
- * 绂忓埄鍏嶅崟鍒稿凡缁忛��鍥�
- *
- * @param coupon
- */
- public void welfareCouponDrawBack(UserSystemCoupon coupon, String orderId);
-
- // 鍏嶅崟鍒�
-
- /**
- * 鍏嶅崟鍒镐娇鐢�
- *
- * @param leftDay
+ * 鍏嶅崟鍒告秷鎭� -浣跨敤鎴愬姛/宸茶繃鏈�
+ * @param uid
+ * @param name
* @param source
- * @param startTime
- * @param endTime
+ * @param num
+ * @param stateDesc
*/
- public void freeSheetCouponGet(UserSystemCoupon coupon);
+ public void freeCouponEndMsg(Long uid, String name, String source, int num, String stateDesc);
+
/**
- * 鍏嶅崟鍒告鍦ㄤ娇鐢�
- *
+ * 濂栧姳鍒�-鎴愬姛鑾峰緱/浣跨敤閫�鍥�
+ * @param uid
+ * @param name
* @param source
+ * @param num
+ * @param stateDesc
* @param startTime
* @param endTime
*/
- public void freeSheetCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money);
+ public void rewardCouponWinMsg(Long uid, String source, int num, String stateDesc, Date startTime,
+ Date endTime);
/**
- * 鍏嶅崟鍒稿凡缁忎娇鐢�
- *
- * @param leftDay
+ * 濂栧姳鍒�-浣跨敤鎴愬姛/宸茶繃鏈�
+ * @param uid
+ * @param name
* @param source
- * @param startTime
- * @param endTime
+ * @param num
+ * @param stateDesc
*/
- public void freeSheetCouponUsed(UserSystemCoupon coupon, String orderId);
+ public void rewardCouponEndMsg(Long uid, String source, int num, String stateDesc);
/**
- * 鍏嶅崟鍒稿嵆灏嗚繃鏈�
- *
- * @param leftDay
- * @param source
- * @param startTime
- * @param endTime
- */
- public void freeSheetCouponWillOutOfDate(UserSystemCoupon coupon);
-
- /**
- * 鍏嶅崟鍒稿凡缁忚繃鏈�
- *
- * @param source
- * @param startTime
- * @param endTime
- */
- public void freeSheetCouponAlreadyOutOfDate(UserSystemCoupon coupon);
-
- /**
- * 宸查��鍥�
- *
- * @param coupon
- */
- public void freeSheetCouponDrawBack(UserSystemCoupon coupon, String orderId);
-
- // 濂栧姳鍒�
-
- /**
- * 濂栧姳鍒歌幏寰�
- *
- * @param coupon
- * @param percent
- * -鐧惧垎姣�
- */
- public void rewardCouponGet(UserSystemCoupon coupon, int percent);
-
- /**
- * 濂栧姳鍒镐娇鐢ㄦ垚鍔�
- *
- * @param coupon
- * @param oldFanLiMoney-鍘熷杩斿埄閲戦
- * @param rewardMoney-濂栧姳閲戦
- */
- public void rewardCouponUsed(UserSystemCoupon coupon, BigDecimal oldFanLiMoney, BigDecimal rewardMoney,
- String orderId);
-
- /**
- * 濂栧姳鍒稿嵆灏嗚繃鏈�
- *
- * @param leftDay
- * @param source
- * @param startTime
- * @param endTime
- */
- public void rewardCouponWillOutOfDate(UserSystemCoupon coupon, int percent);
-
- /**
- * 濂栧姳鍒稿凡缁忚繃鏈�
- *
- * @param source
- * @param startTime
- * @param endTime
- */
- public void rewardCouponAlreadyOutOfDate(UserSystemCoupon coupon);
-
- /**
- * 娣樼ぜ閲戞秷鎭�
- *
+ * 绯荤粺璧犻�侀噾甯佹彁閱�
* @param uid
- * @param beiZhu
- * @param content
+ * @param num
+ * @param banlce
*/
- public void taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO content);
+ public void goldCoinSystemGiveMsg(Long uid, int num, int banlce);
/**
- * 鍙ｄ护璧犻�侀鍙�
- *
+ * 閲戝竵濂栧姳鎻愰啋-閭�璇风矇涓�
* @param uid
- * @param beiZhu
- * @param content
+ * @param num
+ * @param banlce
+ * @param directFans
*/
- public void tokenGiveMsg(Long uid, String beiZhu, MsgOtherGiveContentDTO content);
+ public void goldCoinRewardInviteSucceedMsg(Long uid, int num, int banlce, boolean directFans);
/**
- * 鍏戞崲娑堟伅
- *
+ * 閲戝竵濂栧姳鎻愰啋 - 涓嬪崟浜х敓鐨勫洟闃熸敹鐩婁笉瓒�0.01鍏�
* @param uid
- * @param beiZhu
- * @param content
+ * @param num
+ * @param banlce
+ * @param directFans
*/
- public void exchangeMsg(Long uid, String beiZhu, MsgOtherExchangeContentDTO content);
+ public void goldCoinOrderSubsidyMsg(Long uid, int num, int banlce, boolean directFans);
/**
- * 鍒搁��鍥�
- *
- * @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);
-
- /**
- * 鍏嶅崟鍒告鍦ㄤ娇鐢�
- *
- * @param source
- * @param startTime
- * @param endTime
- */
- public void couponUsingFreeSheet(UserSystemCoupon coupon, String orderId, BigDecimal money,
- MsgTypeOtherTypeEnum type);
-
- public void couponUsedFreeSheet(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type);
-
- /**
- * 璧犻�佺殑鍏嶅崟鍒告縺娲�
- *
+ * 閲戝竵鍏戞崲鎻愰啋
* @param uid
- * @param beiZhu
- * @param content
+ * @param num
+ * @param banlce
+ * @param name
+ * @param exNum
*/
- public void giveCouponActivateMsg(Long uid, String beiZhu, MsgOtherCouponActivateDTO content);
-
- /**
- * 闃熷憳棣栧崟濂栧姳閭�璇蜂汉
- *
- * @param uid
- * @param beiZhu
- * @param content
- */
- public void firstOrderRewardMsg(Long uid, String beiZhu, MsgOtherRewardIntegralDTO content);
-
- /**
- * 绯荤粺璧犻�佺殑鍏嶅崟鍒�
- * @param uid
- * @param beiZhu
- * @param dto
- */
- public void systemGiveRewardCoupon(Long uid, String beiZhu, MsgOtherSystemGiveDTO dto);
-
- /**
- * 娣樼ぜ閲戝厬鎹㈡垚閲戝竵娑堟伅
- * @param uid
- * @param beiZhu
- * @param dto
- */
- public void taoLiJinExchangeMsg(Long uid, String beiZhu, MsgOtherRewardIntegralDTO msgOther);
-
- /**
- * 浼氬憳鐢宠閫氳繃娑堟伅
- * @param uid
- * @param beiZhu
- * @param dto
- */
- public void passVIPApplyMsg(Long uid, String beiZhu, MsgOtherVIPDTO dto);
-
- /**
- * 浼氬憳鍗囩骇鏈�氳繃
- * @param uid
- * @param beiZhu
- * @param dto
- */
- public void rejectVIPApply(Long uid, String beiZhu, MsgOtherVIPDTO dto);
-
- /**
- * 娓╅Θ鎻愰啋
- * @param uid
- * @param beiZhu
- * @param dto
- */
- public void teamVIPCallBoss(Long uid, String beiZhu, MsgOtherVIPDTO dto);
-
- /**
- * 閭�璇疯劚绂�
- * @param uid
- * @param beiZhu
- * @param dto
- */
- public void teamSplitCallBoss(Long uid, String beiZhu, MsgOtherVIPDTO dto);
+ public void goldCoinExChangeMsg(Long uid, int num, int banlce, String name, String exNum);
}
--
Gitblit v1.8.0