From 3fbe140485d5fe11c6aa7368b3eace17d14c97ea Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 23 Jun 2024 10:58:16 +0800
Subject: [PATCH] 后台矩阵列表

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index c9a75a7..c239092 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -239,7 +239,7 @@
                     return;
                 }
                 //有,则上级节点出局复投,轮数加1,复投逻辑
-                memberNodeNext(dbMemberNodeRoot);
+                this.memberNodeNext(dbMemberNodeRoot);
             }else{//父节点为左节点,那么没人出局
                 return;
             }
@@ -256,6 +256,7 @@
      * 有,则上级节点出局复投,轮数加1,复投逻辑
      * @param dbMemberNodeRoot
      */
+    @Override
     public void memberNodeNext(DbMemberNode dbMemberNodeRoot) {
         log.info("进入复投");
 
@@ -320,8 +321,6 @@
                 //如果是第一轮,下一个新团有投入,则产生收益
                 //复投或者收益的金额
                 if(1 == countFund){//第一轮
-                    //复投本轮,轮数 +1
-                    futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
                     //收益复投(当前的下一个星团没有已投入),还是收益提出
                     Integer nextType = type + 1;
                     QueryWrapper<DbMemberNode> nodeQueryWrapper = new QueryWrapper<>();
@@ -334,6 +333,8 @@
                     }else{
                         perkSevenTeen(memberId,perkAmount,countFund);
                     }
+                    //复投本轮,轮数 +1
+                    futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
                 }else{//2-9轮
                     //复投本轮,轮数 +1
                     futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
@@ -416,12 +417,15 @@
             if(ObjectUtil.isEmpty(dbMemberNodeRoot)){
                 return;
             }
+            if(dbMemberNodeRoot.getLeftRight() == 1){
+                return;
+            }
             //每个星团,只复投10轮
             if(10 < dbMemberNodeRoot.getCountFund()){
                 return;
             }
 
-            memberNodeNext(dbMemberNodeRoot);
+            this.memberNodeNext(dbMemberNodeRoot);
         }
     }
 

--
Gitblit v1.9.1