From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 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 76d9a66..20e3dd8 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
@@ -49,8 +49,7 @@
private final SqlSessionTemplate sqlSessionTemplate;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final MallMqRecordMapper mallMqRecordMapper;
-
- private final MatrixTreeNodeMapper matrixTreeNodeMapper;
+ private final IMatrixTreeNodeService matrixTreeNodeService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -61,34 +60,18 @@
return;
}
- MatrixTree tree = MatrixTree.getInstance();
- MemberNode node = tree.getNode(member.getInviteId());
- if (node != null) {
+ MemberNode parentNode = matrixTreeNodeService.addTreeNode(memberId);
+ if (parentNode == null) {
+ log.info("父级节点未找到:{}", memberId);
return;
}
-
- MatrixTreeNode matrixTreeNode = matrixTreeNodeMapper.selectByTreeNode(memberId);
- if (matrixTreeNode != null) {
- return;
- }
-
- node = new MemberNode();
- node.setInviteId(member.getInviteId());
- node.setPhone(member.getPhone());
- node.setRefererId(member.getReferrerId());
- node.setMemberId(member.getId());
- MemberNode parentNode = tree.addNode(node);
-
- matrixTreeNode = new MatrixTreeNode();
- matrixTreeNode.setTreeNode(memberId);
- matrixTreeNode.setParentNode(parentNode.getMemberId());
- matrixTreeNodeMapper.insert(matrixTreeNode);
List<DataDictionaryCustom> dicList = dataDictionaryCustomMapper.selectDicByType(AppContants.AGENT_LEVEL);
DataDictionaryCustom dic = null;
for (DataDictionaryCustom dataDictionaryCustom : dicList) {
if (Integer.parseInt(dataDictionaryCustom.getValue()) == parentNode.CHILD.size()) {
dic = dataDictionaryCustom;
+ break;
}
}
@@ -98,7 +81,10 @@
MallMember parentMember = memberMapper.selectById(parentNode.getMemberId());
parentMember.setChildNodeCnt(parentNode.CHILD.size());
- parentMember.setLevel(dic.getCode());
+ int levelCode = MemberLevelEnum.getLevelCode(parentMember.getLevel());
+ if (Integer.parseInt(dic.getValue()) >= levelCode) {
+ parentMember.setLevel(dic.getCode());
+ }
memberMapper.updateById(parentMember);
}
--
Gitblit v1.9.1