From 04e85c19e6cafd1cd65ade89b76a4e9ee5211c08 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 27 四月 2020 16:59:51 +0800
Subject: [PATCH] 佣金显示比例方法修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 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 e81b3a7..e5447c2 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
@@ -65,7 +65,6 @@
@Resource
private UserInfoExtraService userInfoExtraService;
-
@Resource
private UserInfoService userInfoService;
@@ -172,32 +171,37 @@
// 楠岃瘉鏄惁婊¤冻鍗囩骇楂樼骇浼氬憳
if (doneZiGou >= limitZiGou7) {
try {
- twoProcess(uid, limitZiGou7, null);
+ twoProcess(uid, limitZiGou7, null, false);
} catch (UserVIPPreInfoException e) {
-
+
}
}
}
@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;
}
@@ -205,7 +209,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();
@@ -213,11 +217,17 @@
long limitFirst7 = 0;
String first7 = userVipConfigService.getValueByKey("vip_pre_7_first_level_team_count");
+ if (Constant.IS_TEST)
+ first7 = "30";
+
if (!StringUtil.isNullOrEmpty(first7)) {
limitFirst7 = Long.parseLong(first7);
}
+
long limitSecond7 = 0;
String second7 = userVipConfigService.getValueByKey("vip_pre_7_second_level_team_count");
+ if (Constant.IS_TEST)
+ second7 = "30";
if (!StringUtil.isNullOrEmpty(second7)) {
limitSecond7 = Long.parseLong(second7);
}
@@ -225,9 +235,9 @@
// 楠岃瘉鏄惁婊¤冻鍗囩骇楂樼骇浼氬憳
if (doneFirst >= limitFirst7 && doneSecond >= limitSecond7) {
try {
- twoProcess(bossId, limitFirst7, limitSecond7);
+ twoProcess(uid, limitFirst7, limitSecond7, true);
} catch (UserVIPPreInfoException e) {
-
+
}
}
}
@@ -242,12 +252,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();
@@ -275,7 +285,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);
@@ -302,4 +312,9 @@
return userVIPPreInfoMapper.selectByUidAndProcess(uid, process);
}
+ @Override
+ public void deleteByPrimaryKey(Long id) {
+ userVIPPreInfoMapper.deleteByPrimaryKey(id);
+ }
+
}
--
Gitblit v1.8.0