From b075056e19b8f59f61fce3433aa04ffed3d746a4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Nov 2022 09:07:46 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 3d6bb3b..39d23d7 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
@@ -8,6 +8,7 @@
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;
@@ -18,6 +19,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -44,6 +46,7 @@
private final DappAchieveTreeDao dappAchieveTreeDao;
private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao;
private final DappWalletService dappWalletService;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
@@ -166,7 +169,7 @@
DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
if (parent != null) {
- BigDecimal directProfit = new BigDecimal("100").multiply(new BigDecimal("0.15"));
+ BigDecimal directProfit = TreeConstants.PUT_IN_AMOUNT.multiply(new BigDecimal("0.1"));
dappWalletService.updateWalletCoinWithLock(directProfit, parent.getId(), 1);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(parent.getId(), directProfit, 3, 2, null, null);
@@ -193,8 +196,6 @@
} else {
amount = TreeConstants.FULL_PROFIT_AMOUNT;
}
-
- dappWalletService.releaseFrozenAmountWithLock(memberId);
member.setOutCnt(member.getOutCnt() + 1);
dappMemberDao.updateById(member);
@@ -246,4 +247,39 @@
dappAchieveMemberTreeDao.emptyTable();
dappMemberDao.updateMemberActive();
}
+
+ @Override
+ public void feeDistribute(String data) {
+ if (StrUtil.isBlank(data)) {
+ return;
+ }
+
+ Long flowId = Long.parseLong(data);
+ DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(flowId);
+ if (fundFlow == null) {
+ return;
+ }
+
+ DataDictionaryCustom memberFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MEMBER_FEE.getType(), DataDictionaryEnum.MEMBER_FEE.getCode());
+ if (memberFeeDic == null) {
+ log.info("未设置手续费返利比例");
+ return;
+ }
+ List<DappMemberEntity> memberList = dappMemberDao.selectMemberListNeedProfit();
+ if (CollUtil.isEmpty(memberList)) {
+ return;
+ }
+
+ 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), 8, RoundingMode.HALF_DOWN);
+
+ memberList.forEach(item -> {
+ dappWalletService.updateWalletMineWithLock(perProfit, item.getId(), 1);
+
+ DappFundFlowEntity profitFlow = new DappFundFlowEntity(item.getId(), perProfit, 12, 2, null, null);
+ dappFundFlowDao.insert(profitFlow);
+ });
+ }
}
--
Gitblit v1.9.1