From 2ef870d14d21528b963023db8b89bec6a4184b29 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 May 2023 16:47:40 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 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 6f82b1f..66ccb71 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
@@ -655,7 +655,7 @@
                 memberId,
                 amount.multiply(new BigDecimal(3)),
                 FundFlowEnum.MEMBER_AMOUNT_PERK_TOTAL.getCode(),
-                1,
+                2,
                 BigDecimal.ZERO,
                 null,
                 chergeRecordId);
@@ -1479,25 +1479,26 @@
     public BigDecimal superNodePoolPerk(BigDecimal nodeFivePoolDicCnt, String code, int code1) {
         BigDecimal realPerkAmount = BigDecimal.ZERO;
         //获取type级别的会员
-        List<DappMemberNodeEntity> dappMemberNodeEntities = dappMemberNodeMapper.selectNodeByNodeCode(NodeCodeEnum.SUPER_NODE.getCode());
+//        List<DappMemberNodeEntity> dappMemberNodeEntities = dappMemberNodeMapper.selectNodeByNodeCode(NodeCodeEnum.SUPER_NODE.getCode());
+        List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectByNodetype();
         //每日补贴总数
 //        BigDecimal nodePerk = nodeFivePoolDicCnt.multiply(AppContants.NODE_PERK_PERCENT);
         BigDecimal nodePerk = nodeFivePoolDicCnt;
-        if(CollUtil.isNotEmpty(dappMemberNodeEntities)){
+        if(CollUtil.isNotEmpty(dappMemberEntities)){
             //每人的补贴
-            BigDecimal averagePerk = nodePerk.divide(new BigDecimal(dappMemberNodeEntities.size()), 4, BigDecimal.ROUND_DOWN);
+            BigDecimal averagePerk = nodePerk.divide(new BigDecimal(dappMemberEntities.size()), 4, BigDecimal.ROUND_DOWN);
 
-            for(DappMemberNodeEntity dappMemberNodeEntity : dappMemberNodeEntities){
+            for(DappMemberEntity dappMemberEntitie : dappMemberEntities){
 
                 DappFundFlowEntity fundFlowToMember = new DappFundFlowEntity(
-                        dappMemberNodeEntity.getMemberId(),
+                        dappMemberEntitie.getId(),
                         averagePerk,
                         code1,
                         2,
                         BigDecimal.ZERO);
                 dappFundFlowDao.insert(fundFlowToMember);
                 //用户的A币账户增加memberGetACnt数量
-                dappWalletService.updateWalletMineWithLock(averagePerk,dappMemberNodeEntity.getMemberId(),1);
+                dappWalletService.updateWalletMineWithLock(averagePerk,dappMemberEntitie.getId(),1);
 
                 realPerkAmount = realPerkAmount.add(averagePerk);
             }

--
Gitblit v1.9.1