From c3da189b4b2fda93d2e610fca8b0bc29f7502056 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 17:32:41 +0800
Subject: [PATCH] 会员升级消息改造
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
index 3cbd1c8..b6bd027 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -171,7 +171,7 @@
// 楠岃瘉鏄惁婊¤冻鍗囩骇楂樼骇浼氬憳
if (doneZiGou >= limitZiGou7) {
try {
- twoProcess(uid, limitZiGou7, null);
+ twoProcess(uid, limitZiGou7, null, false);
} catch (UserVIPPreInfoException e) {
}
@@ -232,7 +232,7 @@
// 楠岃瘉鏄惁婊¤冻鍗囩骇楂樼骇浼氬憳
if (doneFirst >= limitFirst7 && doneSecond >= limitSecond7) {
try {
- twoProcess(uid, limitFirst7, limitSecond7);
+ twoProcess(uid, limitFirst7, limitSecond7, true);
} catch (UserVIPPreInfoException e) {
}
@@ -251,12 +251,12 @@
* @param secondTeam
*/
@Transactional(rollbackFor = Exception.class)
- private void twoProcess(Long uid, long limit1, Long limit2) throws UserVIPPreInfoException {
+ private void twoProcess(Long uid, long limit1, Long limit2, boolean teamPass) throws UserVIPPreInfoException {
String item = null;
- if (limit2 == null) {
- item = "杩斿埄+鍒嗕韩璁㈠崟";
- } else {
+ if (teamPass) {
item = "鐩存帴+闂存帴绮変笣";
+ } else {
+ item = "杩斿埄+鍒嗕韩璁㈠崟";
}
Date upgradeTime = new Date();
@@ -284,7 +284,7 @@
registerTime = userInfoRegister.getCreateTime();
}
int daysBetween = TimeUtil.getDayDifferenceCount(registerTime, upgradeTime);
- userAccountMsgNotificationService.vipPreUpgrade(uid, "蹇渷杈句汉", "楂樼骇浼氬憳", daysBetween, limit1, limit2);
+ userAccountMsgNotificationService.vipPreUpgrade(uid, "蹇渷杈句汉", "楂樼骇浼氬憳", daysBetween, limit1, limit2, teamPass);
// 鐩存帴绮変笣鍗囩骇鎻愰啋
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
--
Gitblit v1.8.0