From 783a06c84f8934e59a7e45e3c948727520e3cd4f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 11 Jun 2024 17:36:08 +0800
Subject: [PATCH] 节点收益

---
 src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java b/src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java
index 1b842c4..c4ee5f2 100644
--- a/src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java
+++ b/src/main/java/cc/mrbird/febs/job/MatrixTreeInit.java
@@ -1,11 +1,14 @@
 package cc.mrbird.febs.job;
 
 import cc.mrbird.febs.dapp.entity.DappAchieveTreeEntity;
+import cc.mrbird.febs.dapp.entity.DappMemberEntity;
 import cc.mrbird.febs.dapp.mapper.DappAchieveTreeDao;
+import cc.mrbird.febs.dapp.mapper.DappMemberDao;
 import cc.mrbird.febs.tree.MatrixTree;
 import cc.mrbird.febs.tree.MemberNode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -17,23 +20,32 @@
  **/
 @Slf4j
 @Component
+@ConditionalOnProperty(prefix = "system", name = "chain-listener", havingValue = "true")
 public class MatrixTreeInit {
 
     @Autowired
     private DappAchieveTreeDao dappAchieveTreeDao;
 
+    @Autowired
+    private DappMemberDao dappMemberDao;
+
     @PostConstruct
     public void init() {
-        List<DappAchieveTreeEntity> tree = dappAchieveTreeDao.selectTreeList();
+//        List<DappAchieveTreeEntity> tree = dappAchieveTreeDao.selectTreeList();
+        List<DappAchieveTreeEntity> tree = dappAchieveTreeDao.selectTreeListV2();
 
         MatrixTree instance = MatrixTree.getInstance();
         for (DappAchieveTreeEntity treeNode : tree) {
+            Long memberId = treeNode.getMemberId();
+            DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+
 
             MemberNode node = new MemberNode();
-            node.setAddress(treeNode.getAddress());
-            node.setInviteId(treeNode.getInviteId());
-            node.setRefererId(treeNode.getRefererId());
-            node.setMemberId(treeNode.getMidNode());
+            node.setAddress(dappMemberEntity.getAddress());
+            node.setInviteId(dappMemberEntity.getInviteId());
+            node.setRefererId(dappMemberEntity.getRefererId());
+            node.setMemberId(treeNode.getMemberId());
+            node.setFundId(treeNode.getFundId());
             instance.addNode(node);
         }
     }

--
Gitblit v1.9.1