From 2eff39a10917e141d2a61ff9f0763c10858cd0b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 28 Sep 2021 21:07:07 +0800
Subject: [PATCH] 20210928
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 6f2ed11..2f2993f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -53,27 +53,27 @@
return;
}
- // 未激活用户无法升级
- if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
- return;
- }
-
List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
for (MallMember parent : parentMembers) {
+ // 未激活用户无法升级
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
+ continue;
+ }
+
DataDictionaryCustom nextLevel = dataDictionaryCustomMapper.selectNextAgentLevelInfo(parent.getLevel());
if (nextLevel == null) {
log.info("当前层级无下一级:{}", parent.getLevel());
- return;
+ continue;
}
AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
if (!orderCntFinish(parent, agentInfo)) {
- return;
+ continue;
}
if (!agentCntFinish(parent, agentInfo)) {
- return;
+ continue;
}
parent.setLevel(nextLevel.getCode());
@@ -107,7 +107,7 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null) {
+ if (agentInfo.getLastCnt() == null || agentInfo.getLastCnt() == 0) {
return true;
}
--
Gitblit v1.9.1