From 76e42bfdf66fbd49e4ed3173236b2f4b352685b2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 07 Jun 2024 16:43:11 +0800
Subject: [PATCH] 将监听充值新建一个项目
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 57cae47..a22b602 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
@@ -1,24 +1,20 @@
package cc.mrbird.febs.dapp.service.impl;
-import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.common.utils.SpringContextUtil;
-import cc.mrbird.febs.dapp.chain.ChainEnum;
-import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.dto.SystemDto;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
-import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cc.mrbird.febs.tree.MatrixTree;
import cc.mrbird.febs.tree.MemberNode;
import cc.mrbird.febs.tree.TreeConstants;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -27,7 +23,8 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
/**
* @author
@@ -62,6 +59,9 @@
@Transactional(rollbackFor = Exception.class)
public synchronized void achieveTree(Long memberId) {
DappMemberEntity member = dappMemberDao.selectById(memberId);
+ if(ObjectUtil.isEmpty(member)){
+ return;
+ }
int batchNo = 0;
DappAchieveTreeEntity newestTreeNode = dappAchieveTreeDao.selectNewestTreeNode();
@@ -103,10 +103,11 @@
dappAchieveMemberTreeDao.insert(achieveMemberTree);
// 激活用户状态
- member.setActiveStatus(1);
- dappMemberDao.updateById(member);
+// member.setActiveStatus(1);
+// dappMemberDao.updateById(member);
+// dappMemberDao.updateMemberActiveV2(member.getId());
- putIntoProfit(memberId, 2);
+// putIntoProfit(memberId, 2);
if (parentNode == null) {
return;
}
@@ -273,7 +274,7 @@
BigDecimal feeReturnRatio = new BigDecimal(memberFeeDic.getValue());
int size = memberList.size();
BigDecimal totalProfit = fundFlow.getFee().multiply(feeReturnRatio.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN));
- BigDecimal perProfit = totalProfit.divide(BigDecimal.valueOf(size), 2, RoundingMode.HALF_DOWN);
+ BigDecimal perProfit = totalProfit.divide(BigDecimal.valueOf(size), 8, RoundingMode.HALF_DOWN);
memberList.forEach(item -> {
dappWalletService.updateWalletMineWithLock(perProfit, item.getId(), 1);
--
Gitblit v1.9.1