From 3c003359360a42a914c13de5cb5ae48ab8368530 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 08 Jun 2022 10:05:18 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 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 f235f25..f4fc826 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
@@ -10,6 +10,7 @@
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappSystemService;
+import cc.mrbird.febs.dapp.utils.OnlineTransferUtil;
import cc.mrbird.febs.dapp.vo.RedisTransferPoolVo;
import cc.mrbird.febs.dapp.vo.SlipSettingVo;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
@@ -75,6 +76,27 @@
DappMemberEntity member = LoginUserUtil.getAppUser();
SystemDto system = new SystemDto();
+ String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
+ // 启动未启动
+ if (!"start".equals(hasStart)) {
+ system.setFeeRatio(BigDecimal.TEN);
+ system.setUsdtRemain(BigDecimal.ZERO);
+ system.setUsdtTotal(BigDecimal.ZERO);
+ system.setSaleRemain(BigDecimal.ZERO);
+ system.setSaleTotal(BigDecimal.ZERO);
+ Object makePoolObj = redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
+ BigDecimal balance;
+ if (makePoolObj == null) {
+ balance = ChainService.getInstance(ChainEnum.BSC_TFC_MAKE.name()).balanceOf(ChainEnum.BSC_TFC_MAKE.getAddress());
+ redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, balance);
+ } else {
+ balance = (BigDecimal) makePoolObj;
+ }
+ system.setBuyRemain(balance);
+ system.setBuyTotal(balance);
+
+ return system;
+ }
RedisTransferPoolVo transferPool = (RedisTransferPoolVo) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
BigDecimal poolRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
@@ -134,8 +156,7 @@
// 销毁
// instance.transfer(AppContants.DESTROY_ADDRESS, destroy);
- DappOnlineTransferEntity destroyRecord = new DappOnlineTransferEntity(AppContants.DESTROY_ADDRESS, destroy, fundflow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), "TFC", fundflow.getId().toString());
- dappOnlineTransferDao.insert(destroyRecord);
+ OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, fundflow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, fundflow.getId().toString());
// 总分发金额
BigDecimal distrbAmount = fee.subtract(destroy);
@@ -145,25 +166,20 @@
BigDecimal nodeAmount = distrbAmount.subtract(techAmount);
log.info("总分发金额:{}, 技术:{}, 节点:{}", distrbAmount, techAmount, nodeAmount);
-
- BigDecimal preNode = slipSetting.getNodeProp().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
- log.info("每份:{}", preNode);
int i = 1;
for (DappMemberEntity parent : parents) {
BigDecimal balance = instance.balanceOf(parent.getAddress());
log.info("地址:{}, 余额:{}", parent.getAddress(), balance);
- // 若地址持币少了指定数量 或者 不为创始节点，则不参与节点滑点
- if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 0 || parent.getNodeType() == 2) {
+ // 若地址持币少了指定数量
+ if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 0) {
return;
}
DataDictionaryCustom distribDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_DISTRIBUTE_PROP, String.valueOf(i));
- BigDecimal total = new BigDecimal(distribDic.getValue()).multiply(preNode);
+ BigDecimal total = distrbAmount.multiply(new BigDecimal(distribDic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-// instance.transfer(parent.getAddress(), total);
- DappOnlineTransferEntity distribRecord = new DappOnlineTransferEntity(parent.getAddress(), total, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), "TFC", fundflow.getId().toString());
- dappOnlineTransferDao.insert(distribRecord);
+ OnlineTransferUtil.addTransfer(parent.getAddress(), total, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, fundflow.getId().toString());
nodeAmount = nodeAmount.subtract(total);
}
@@ -172,8 +188,7 @@
techAmount = techAmount.add(nodeAmount);
// instance.transfer(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount);
- DappOnlineTransferEntity techRecord = new DappOnlineTransferEntity(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount, fundflow.getType(), 2, ChainEnum.BSC_TFC_SOURCE.name(), "TFC", fundflow.getId().toString());
- dappOnlineTransferDao.insert(techRecord);
+ OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount, fundflow.getType(), 2, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, fundflow.getId().toString());
Map<String, String> map = new HashMap<>();
map.put("batchNo", fundflow.getId().toString());
@@ -221,8 +236,7 @@
continue;
}
- DappOnlineTransferEntity tfc = new DappOnlineTransferEntity(member.getAddress(), mine, 3, 1, "TFC", ChainEnum.BSC_TFC.name(), batchNo);
- dappOnlineTransferDao.insert(tfc);
+ OnlineTransferUtil.addTransfer(member.getAddress(), mine, 3, 1, ChainEnum.BSC_TFC.name(), AppContants.SYMBOL_COIN, batchNo);
}
Map<String, String> map = new HashMap<>();
@@ -249,8 +263,8 @@
}
// TODO 线上转账，已注释
-// String txHash = ChainService.getInstance(transfer.getFromType()).transfer(transfer.getAddress(), transfer.getAmount());
-// transfer.setTxHash(txHash);
+ String txHash = ChainService.getInstance(transfer.getFromType()).transfer(transfer.getAddress(), transfer.getAmount());
+ transfer.setTxHash(txHash);
transfer.setHasFinish(1);
transfer.setUpdateTime(new Date());
dappOnlineTransferDao.updateById(transfer);
@@ -259,11 +273,25 @@
DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(Long.parseLong(batchNo));
fundFlow.setStatus(3);
-// fundFlow.setToHash(txHash);
+ fundFlow.setToHash(txHash);
dappFundFlowDao.updateById(fundFlow);
}
+ // 修改剩余量
+ if (AppContants.SYMBOL_COIN.equals(transfer.getSymbol())) {
+
+ BigDecimal poolRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, poolRemain.subtract(transfer.getAmount()));
+ } else {
+
+ BigDecimal usdtRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN);
+ usdtRemain = usdtRemain.subtract(transfer.getAmount());
+ if (usdtRemain.compareTo(BigDecimal.ZERO) < 0) {
+ usdtRemain = BigDecimal.ZERO;
+ }
+ redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
+ }
}
}
}
--
Gitblit v1.9.1