From b3b3baf9a3b0147ca38476450ca1823c291abd20 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 21 Jun 2024 23:02:46 +0800
Subject: [PATCH] 后台矩阵列表

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 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 83c7abc..4b6e919 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
@@ -28,6 +28,7 @@
 import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author
@@ -275,6 +276,19 @@
             return;
         }
         if(inviteNum > dappMemberEntities.size()){
+            return;
+        }
+        List<Long> collect = dappMemberEntities.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
+        QueryWrapper<DbMemberNode> inviteNodeQuery = new QueryWrapper<>();
+        inviteNodeQuery.select("member_id");
+        inviteNodeQuery.eq("work_state", DbMemberNode.STATE_ONE);
+        inviteNodeQuery.in("member_id",collect);
+        inviteNodeQuery.groupBy("member_id");
+        List<DbMemberNode> inviteNodes = dbMemberNodeMapper.selectList(inviteNodeQuery);
+        if(CollUtil.isEmpty(inviteNodes)){
+            return;
+        }
+        if(inviteNum > inviteNodes.size()){
             return;
         }
         //任何星级的原来节点都要出局
@@ -556,10 +570,11 @@
             if(ObjectUtil.isEmpty(dappMemberEntityRef)){
                 return;
             }
+
+            memberId = dappMemberEntityRef.getId();
             //如果为购买星级激活用户,则跳过
             Integer activeStatus = dappMemberEntityRef.getActiveStatus();
             if(1 != activeStatus){
-                memberId = dappMemberEntityRef.getId();
                 continue;
             }
             //获取上级全部的直推
@@ -570,7 +585,6 @@
 
             //如果没有直推,则跳过
             if(CollUtil.isEmpty(memberInviteList)){
-                memberId = dappMemberEntityRef.getId();
                 continue;
             }
 
@@ -580,10 +594,9 @@
             }
             //如果直推不满足当前规则需要的人数,则跳过
             if(memberInviteList.size() < rule.getInviteNum()){
-                memberId = dappMemberEntityRef.getId();
                 continue;
             }
-            BigDecimal perkPercent = new BigDecimal(rule.getPerkPercent());
+            BigDecimal perkPercent = new BigDecimal(rule.getPerkPercent()).multiply(new BigDecimal("0.01"));
             BigDecimal perkAmount = perkPercent.multiply(amount);
             Long perkMemberId = dappMemberEntityRef.getId();
             //生成一条流水
@@ -626,7 +639,7 @@
                 DataDictionaryEnum.PERK_NUM.getType(),
                 DataDictionaryEnum.PERK_NUM.getCode()
         );
-        BigDecimal perKNum = new BigDecimal(ObjectUtil.isEmpty(perkPercentDic) ? "1000" : perKNumDic.getValue());
+        BigDecimal perKNum = new BigDecimal(ObjectUtil.isEmpty(perKNumDic) ? "200" : perKNumDic.getValue());
 
         BigDecimal perkAmount = amount.multiply(perkPercent).divide(perKNum, 8, BigDecimal.ROUND_DOWN);
         if(BigDecimal.ZERO.compareTo(perkAmount) >= 0){
@@ -653,7 +666,10 @@
                 return;
             }
             //奖励金额
-            BigDecimal memberPerk = perkPercent.multiply(buyNode);
+            BigDecimal memberPerk = perkAmount.multiply(buyNode);
+            if(BigDecimal.ZERO.compareTo(memberPerk) >= 0){
+                continue;
+            }
             dappWalletService.updateWalletCoinWithLock(memberPerk, dappMemberEntity.getId(), 1);
 
             DappFundFlowEntity fundFlow = new DappFundFlowEntity(

--
Gitblit v1.9.1