From e153ad745d6bec9f6053ec08aa4e2f1d21cb8320 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jul 2022 23:23:10 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 95383f1..69f033a 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
@@ -41,7 +41,7 @@
import java.util.*;
/**
- * @author
+ * @author
* @date 2022-03-24
**/
@Slf4j
@@ -176,7 +176,8 @@
parents = new ArrayList<>();
} else {
List<String> inviteIds = StrUtil.split(member.getRefererId(), ',');
- parents = dappMemberDao.selectParentsList(inviteIds, 6);;
+ parents = dappMemberDao.selectParentsList(inviteIds, 6);
+ ;
}
DataDictionaryCustom miniHoldCoin = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
@@ -270,12 +271,48 @@
@Override
public void tradeNftProfitDistribute(Long id) {
DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(id);
+ String batchNo = RandomUtil.randomString(16) + id.toString();
- BigInteger totalNFT = ChainService.getInstance(ChainEnum.BSC_TFC.name()).totalSupply();
+ ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
+ BigDecimal preNFTAmount;
+ BigDecimal distribAmount = fundFlow.getFee();
+ if (fundFlow.getType() == 1) {
+ preNFTAmount = distribAmount.divide(new BigDecimal("5000"), 2, RoundingMode.HALF_UP);
+ } else if (fundFlow.getType() == 2) {
+ BigDecimal destroyAmount = fundFlow.getFee().multiply(new BigDecimal("2").divide(new BigDecimal("7"), instance.decimals(), RoundingMode.HALF_UP));
+ // 销毁
+ OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+ distribAmount = fundFlow.getFee().subtract(destroyAmount);
+ preNFTAmount = distribAmount.divide(new BigDecimal("5000"), 2, RoundingMode.HALF_UP);
+ } else {
+ return;
+ }
+ List<DappMemberEntity> allMembers = dappMemberDao.selectList(null);
+ if (CollUtil.isEmpty(allMembers)) {
+ return;
+ }
+
+ BigDecimal total = BigDecimal.ZERO;
+ for (DappMemberEntity member : allMembers) {
+ BigDecimal balance = instance.balanceOf(member.getAddress());
+ BigDecimal memberProfit = balance.multiply(preNFTAmount);
+
+ // 返利
+ OnlineTransferUtil.addTransfer(member.getAddress(), memberProfit, fundFlow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+
+ DappFundFlowEntity distribFlow = new DappFundFlowEntity(member.getId(), memberProfit, 4, 2, BigDecimal.ZERO);
+ dappFundFlowDao.insert(distribFlow);
+
+ total = total.add(memberProfit);
+ }
+
+ BigDecimal remain = distribAmount.subtract(total);
+ // 剩余的
+ OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_TECH.getAddress(), remain, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
}
// public static void main(String[] args) throws IOException {
@@ -487,7 +524,7 @@
Object o = redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
if (o == null) {
- RedisTransferPoolVo transferPool= new RedisTransferPoolVo();
+ RedisTransferPoolVo transferPool = new RedisTransferPoolVo();
BigDecimal total = basicVol.multiply(volProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
transferPool.setTodayVol(total);
transferPool.setTodayProp(volProp);
--
Gitblit v1.9.1