From 7364f85670c7a5bff85a47e38a4ac007de4c8c0f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 23 Jun 2024 22:49:50 +0800
Subject: [PATCH] 后台矩阵列表

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   76 ++++++++++++++++++++-----------------
 1 files changed, 41 insertions(+), 35 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 c239092..5ad72f5 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
@@ -305,42 +305,48 @@
 
             return;
         }else{
+            //复投
             Integer type = dbMemberNodeRoot.getType();
-            //如果是13星局,则直接复投产生收益
-            if(NodeType.NODE_13.getNodeType() == type){
-                //复投
-                futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
-                //产生收益
-                perkSevenTeen(memberId,perkAmount,countFund);
-                return;
-            }
-            //如果是1到12星团
-            if(type >=NodeType.NODE_1.getNodeType() && type <= NodeType.NODE_12.getNodeType()){
-                //需要复投本轮,
-                //如果是第一轮,当下一个星团没有投入时,收益复投下一个新团
-                //如果是第一轮,下一个新团有投入,则产生收益
-                //复投或者收益的金额
-                if(1 == countFund){//第一轮
-                    //收益复投(当前的下一个星团没有已投入),还是收益提出
-                    Integer nextType = type + 1;
-                    QueryWrapper<DbMemberNode> nodeQueryWrapper = new QueryWrapper<>();
-                    nodeQueryWrapper.eq("member_id",memberId);
-                    nodeQueryWrapper.eq("type", nextType);
-                    nodeQueryWrapper.eq("work_state", DbMemberNode.STATE_ONE);
-                    DbMemberNode dbMemberNode = dbMemberNodeMapper.selectOne(nodeQueryWrapper);
-                    if(ObjectUtil.isEmpty(dbMemberNode)){
-                        futouSixTeen(memberId,perkAmount,nextType,1);
-                    }else{
-                        perkSevenTeen(memberId,perkAmount,countFund);
-                    }
-                    //复投本轮,轮数 +1
-                    futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
-                }else{//2-9轮
-                    //复投本轮,轮数 +1
-                    futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
-                    perkSevenTeen(memberId,perkAmount,countFund);
-                }
-            }
+            futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
+            //产生收益
+            perkSevenTeen(memberId,perkAmount,countFund);
+            return;
+//            Integer type = dbMemberNodeRoot.getType();
+//            //如果是13星局,则直接复投产生收益
+//            if(NodeType.NODE_13.getNodeType() == type){
+//                //复投
+//                futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
+//                //产生收益
+//                perkSevenTeen(memberId,perkAmount,countFund);
+//                return;
+//            }
+//            //如果是1到12星团
+//            if(type >=NodeType.NODE_1.getNodeType() && type <= NodeType.NODE_12.getNodeType()){
+//                //需要复投本轮,
+//                //如果是第一轮,当下一个星团没有投入时,收益复投下一个新团
+//                //如果是第一轮,下一个新团有投入,则产生收益
+//                //复投或者收益的金额
+//                if(1 == countFund){//第一轮
+//                    //收益复投(当前的下一个星团没有已投入),还是收益提出
+//                    Integer nextType = type + 1;
+//                    QueryWrapper<DbMemberNode> nodeQueryWrapper = new QueryWrapper<>();
+//                    nodeQueryWrapper.eq("member_id",memberId);
+//                    nodeQueryWrapper.eq("type", nextType);
+//                    nodeQueryWrapper.eq("work_state", DbMemberNode.STATE_ONE);
+//                    DbMemberNode dbMemberNode = dbMemberNodeMapper.selectOne(nodeQueryWrapper);
+//                    if(ObjectUtil.isEmpty(dbMemberNode)){
+//                        futouSixTeen(memberId,perkAmount,nextType,1);
+//                    }else{
+//                        perkSevenTeen(memberId,perkAmount,countFund);
+//                    }
+//                    //复投本轮,轮数 +1
+//                    futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
+//                }else{//2-9轮
+//                    //复投本轮,轮数 +1
+//                    futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
+//                    perkSevenTeen(memberId,perkAmount,countFund);
+//                }
+//            }
         }
     }
     /**

--
Gitblit v1.9.1