From 4117997bad3cf3b078cf24b8718498ab919ea448 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 17:11:46 +0800
Subject: [PATCH] 会员升级调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 3856bfa..3cbd1c8 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
@@ -177,26 +177,34 @@
}
}
}
+
+ @Override
+ @RequestSerializableByKeyService(key = "#uid")
+ @Transactional(rollbackFor = Exception.class)
+ public void upgradeVipByTeamNum(Long uid) {
+ vipTeamVerify(uid);
+ }
+
@Override
@RequestSerializableByKeyService(key = "#tid")
@Transactional(rollbackFor = Exception.class)
- public void upgradeVipByTeamNum(Long tid) {
+ public void upgradeBossVipByTeamNum(Long tid) {
UserInfo boss = threeSaleSerivce.getBoss(tid);
if (boss == null) {
return;
}
- Long bossId = boss.getId();
+ vipTeamVerify(boss.getId());
+ }
- // 楠岃瘉涓婁笂绾� -闂存帴绮変笣鏄惁婊¤冻
- executor.execute(new Runnable() {
- @Override
- public void run() {
- upgradeVipByTeamNum(bossId);
- }
- });
-
- UserVIPPreInfo latest = getLatestProcessInfo(bossId);
+
+
+ /**
+ * 楠岃瘉鐢ㄦ埛鏄惁婊¤冻鍗囩骇闃熷憳鏉′欢
+ * @param uid
+ */
+ private void vipTeamVerify(Long uid) {
+ UserVIPPreInfo latest = getLatestProcessInfo(uid);
if (latest != null && latest.getProcess() == UserVIPPreInfo.PROCESS_2) {
return;
}
@@ -204,7 +212,7 @@
// 鏈夋晥绮変笣
int doneFirst = 0;
int doneSecond = 0;
- UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(bossId);
+ UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
if (userInviteValidNum != null) {
doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
@@ -224,13 +232,15 @@
// 楠岃瘉鏄惁婊¤冻鍗囩骇楂樼骇浼氬憳
if (doneFirst >= limitFirst7 && doneSecond >= limitSecond7) {
try {
- twoProcess(bossId, limitFirst7, limitSecond7);
+ twoProcess(uid, limitFirst7, limitSecond7);
} catch (UserVIPPreInfoException e) {
}
}
}
-
+
+
+
/**
* 浜岄樁娈�
*
--
Gitblit v1.8.0