From 51d5eb2e8befedab840527ec3cb916b8021daf68 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 17:50:16 +0800
Subject: [PATCH] fix
---
src/test/java/cc/mrbird/febs/AgentTest.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 6 +++---
src/main/resources/mapper/modules/MallMemberMapper.xml | 2 +-
3 files changed, 5 insertions(+), 5 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 c4040e6..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
@@ -64,16 +64,16 @@
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());
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 6253701..4549420 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -102,7 +102,7 @@
<select id="selectChildAgentList" resultType="cc.mrbird.febs.mall.entity.MallMember">
select * from mall_member
- where find_in_set(#{inviteId}, referrer_ids) and level=#{agentLevel}
+ where (find_in_set(#{inviteId}, referrer_ids) or invite_id=#{inviteId}) and level=#{agentLevel}
</select>
<select id="selectByInviteIds" resultType="cc.mrbird.febs.mall.entity.MallMember">
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 3ee985f..b9ad05c 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -99,7 +99,7 @@
@Test
public void autoLevelUp() {
// agentService.autoUpAgentLevel(3L);
- agentProducer.sendAutoLevelUpMsg(4L);
+ agentProducer.sendAutoLevelUpMsg(5L);
// agentProducer.sendReturnMoneyMsg(24L);
}
--
Gitblit v1.9.1