From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java
index e650f08..8e7a87f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java
@@ -16,7 +16,7 @@
@Resource
private MsgAccountDetailService msgAccountDetailService;
-
+
@Resource
private MsgExtraService msgExtraService;
@@ -37,20 +37,22 @@
@Override
public void taoBaoAuthFail(Long uid, String taoBaoNickName, String reason) {
- saveDetail(MsgAccountDetailFactory.createBindFail(uid, MsgAccountDetailFactory.TYPE_TB,
+ saveDetail(MsgAccountDetailFactory.createBindFail(uid, MsgAccountDetailFactory.TYPE_TB,
MsgAccountDetailFactory.WAY_CHANGE, reason));
}
-
+
@Override
public void createChangeInviteCode(Long uid, String oldCode, String newCode) {
saveDetail(MsgAccountDetailFactory.createChangeInviteCode(uid, oldCode, newCode));
}
-
+
@Override
- public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2) {
- saveDetail( MsgAccountDetailFactory.vipPreUpgrade(uid, originalName, upName, days, targetNum1,targetNum2));
+ public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2,
+ boolean teamPass) {
+ saveDetail(MsgAccountDetailFactory.vipPreUpgrade(uid, originalName, upName, days, targetNum1, targetNum2,
+ teamPass));
}
-
+
@Override
public void vipUpgradeSuccess(Long uid, int days) {
saveDetail(MsgAccountDetailFactory.vipUpgradeSuccess(uid, days));
@@ -60,17 +62,17 @@
public void vipUpgradeFail(Long uid, String reason) {
saveDetail(MsgAccountDetailFactory.vipUpgradeFail(uid, reason));
}
-
+
@Override
- public void teacherInvite(Long uid, String nickname,String kefuName, String kefuWX) {
- saveDetail(MsgAccountDetailFactory.teacherInvite(uid, nickname, kefuName, kefuWX));
+ public void teacherInvite(Long uid, String nickname, String kefuName, String kefuWX) {
+ saveDetail(MsgAccountDetailFactory.teacherInvite(uid, nickname, kefuName, kefuWX));
}
-
+
@Override
public void teacherSuccess(Long uid, int days, String kefuName, String kefuWX) {
saveDetail(MsgAccountDetailFactory.teacherSuccess(uid, days, kefuName, kefuWX));
}
-
+
private void saveDetail(MsgAccountDetail detail) {
try {
msgAccountDetailService.addMsgAccountDetail(detail);
@@ -78,5 +80,15 @@
e.printStackTrace();
}
}
-
+
+ @Override
+ public void artificialVipUpgradePass(Long uid, String originalName, String upName, int days) {
+ saveDetail(MsgAccountDetailFactory.artificialVipUpgradeSuccess(uid, originalName, upName, days));
+ }
+
+ @Override
+ public void artificialVipUpgradeReject(Long uid, String originalName, String upName, String reson) {
+ saveDetail(MsgAccountDetailFactory.artificialVipUpgradeFail(uid, originalName, upName, reson));
+ }
+
}
--
Gitblit v1.8.0