From d0dd32f897c2b6786f4da8b860b7dcb58a71ac62 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 16:11:44 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index e48676d..e39ba60 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -37,7 +37,7 @@
 import java.util.Map;
 
 /**
- * @author 
+ * @author
  * @date 2022-03-17
  **/
 @Service
@@ -49,7 +49,8 @@
     private final DappWalletMineDao dappWalletMineDao;
     private final DappTransferRecordDao dappTransferRecordDao;
     private final RedisUtils redisUtils;
-    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+    private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -78,7 +79,7 @@
 
         member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
         member.setRefererId(approveDto.getRefererId());
-        if (StrUtil.isNotBlank(approveDto.getRefererId())){
+        if (StrUtil.isNotBlank(approveDto.getRefererId())) {
             boolean flag = false;
             String parentId = approveDto.getRefererId();
             String ids = "";
@@ -94,7 +95,7 @@
                     break;
                 }
                 parentId = parentMember.getRefererId();
-                if(StringUtils.isBlank(parentId)){
+                if (StringUtils.isBlank(parentId)) {
                     break;
                 }
                 if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
@@ -258,7 +259,7 @@
     @Override
     public IPage<DappTransferRecordEntity> selectTransferInPage(DappTransferRecordEntity transfer, QueryRequest request) {
         Page<DappTransferRecordEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return dappTransferRecordDao.selectInPage(transfer,page);
+        return dappTransferRecordDao.selectInPage(transfer, page);
     }
 
     @Override
@@ -298,7 +299,7 @@
 
         member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
         member.setRefererId(refererId);
-        if (StrUtil.isNotBlank(refererId)){
+        if (StrUtil.isNotBlank(refererId)) {
             boolean flag = false;
             String parentId = refererId;
             String ids = "";
@@ -322,7 +323,7 @@
                     break;
                 }
                 parentId = parentMember.getRefererId();
-                if(StringUtils.isBlank(parentId) || "0".equals(parentId)){
+                if (StringUtils.isBlank(parentId) || "0".equals(parentId)) {
                     break;
                 }
                 if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
@@ -338,10 +339,28 @@
     }
 
     @Override
-    public List<TeamListVo> findTeamList(TeamListDto teamListDto) {
+    public TeamListVo findTeamList(TeamListDto teamListDto) {
         DappMemberEntity member = LoginUserUtil.getAppUser();
-        Page<TeamListDto> page = new Page<>(teamListDto.getPageNum(), teamListDto.getPageSize());
-        teamListDto.setInviteId(member.getInviteId());
-        return dappMemberDao.selectTeamListInPage(teamListDto, page).getRecords();
+
+        DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.getId(), 1);
+        return buildTeamMatrix(topNode);
+    }
+
+    public TeamListVo buildTeamMatrix(DappAchieveMemberTreeEntity node) {
+        List<DappAchieveMemberTreeEntity> childNodes = dappAchieveMemberTreeDao.selectMatrixChildNode(node.getTopNode(), node.getTreeNode());
+
+        TeamListVo teamListVo = new TeamListVo();
+        teamListVo.setName(node.getInviteId());
+        teamListVo.setHasMoney(node.getHasMoney());
+
+        if (CollUtil.isEmpty(childNodes)) {
+            return teamListVo;
+        }
+
+        List<TeamListVo> list = new ArrayList<>();
+        for (DappAchieveMemberTreeEntity childNode : childNodes) {
+            list.add(buildTeamMatrix(childNode));
+        }
+        return teamListVo;
     }
 }

--
Gitblit v1.9.1