From 549f5b13855c9cee9b486c2759b9dddab5ce1b7f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 26 Jul 2022 18:57:05 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 147 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 136 insertions(+), 11 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 576c2fa..3b66239 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
@@ -62,6 +62,8 @@
result.put("total", mineAddress.getBalance());
result.put("addreessCnt", addresses.size());
result.put("coinCnt", coinCnt);
+ result.put("sourceTFC", ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(ChainEnum.BSC_TFC_SOURCE.getAddress()));
+ result.put("sourceUSDT", ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress()));
return result;
}
@@ -116,7 +118,14 @@
Object o = redisUtils.get(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress());
- BigDecimal coinTotal = balance.multiply(BigDecimal.valueOf(0.3)).setScale(instance.decimals(), RoundingMode.HALF_DOWN);
+ BigDecimal minLimit = new BigDecimal(50);
+ BigDecimal coinTotal;
+ if (balance.compareTo(minLimit) > 0) {
+ coinTotal = balance.multiply(BigDecimal.valueOf(0.3)).setScale(instance.decimals(), RoundingMode.HALF_DOWN);
+ } else {
+ coinTotal = new BigDecimal(50);
+ }
+
BigDecimal remain;
if (o == null) {
DateTime tomorrow = DateUtil.beginOfDay(DateUtil.tomorrow());
@@ -151,11 +160,13 @@
BigDecimal fee = fundflow.getFee();
DappMemberEntity member = dappMemberDao.selectById(fundflow.getMemberId());
+ List<DappMemberEntity> parents;
if (StrUtil.isBlank(member.getRefererId()) || "0".equals(member.getRefererId())) {
- return;
+ parents = new ArrayList<>();
+ } else {
+ List<String> inviteIds = StrUtil.split(member.getRefererId(), ',');
+ parents = dappMemberDao.selectParentsList(inviteIds, 6);;
}
- List<String> inviteIds = StrUtil.split(member.getRefererId(), ',');
- List<DappMemberEntity> parents = dappMemberDao.selectParentsList(inviteIds, 6);
DataDictionaryCustom miniHoldCoin = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
DataDictionaryCustom slipPointSetting = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SLIP_POINT_SETTING, AppContants.DIC_TYPE_SLIP_POINT_SETTING);
@@ -194,7 +205,6 @@
}
BigDecimal total = distrbAmount.multiply(new BigDecimal(distribDic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-
OnlineTransferUtil.addTransfer(parent.getAddress(), total, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
DappFundFlowEntity distribFlow = new DappFundFlowEntity(parent.getId(), total, 4, 2, BigDecimal.ZERO);
@@ -205,9 +215,38 @@
}
}
+ // 铸池滑点金额
+ BigDecimal makerAmount = distrbAmount.multiply(slipSetting.getMakeProp().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
+ log.info("铸池滑点金额:{}", makerAmount);
+ if (makerAmount.compareTo(BigDecimal.ZERO) > 0) {
+ List<DappMemberEntity> makerAddress = dappMemberDao.selectMakerAddress();
+ if (CollUtil.isNotEmpty(makerAddress)) {
+ BigDecimal totalMaker = BigDecimal.ZERO;
+ Map<String, BigDecimal> map = new HashMap<>();
+ Map<String, Long> addressAndId = new HashMap<>();
+ for (DappMemberEntity maker : makerAddress) {
+ BigDecimal balance = instance.balanceOf(maker.getAddress());
+ map.put(maker.getAddress(), balance);
+ addressAndId.put(maker.getAddress(), maker.getId());
+
+ totalMaker = totalMaker.add(balance);
+ }
+
+ for (Map.Entry<String, BigDecimal> entry : map.entrySet()) {
+ BigDecimal target = makerAmount.multiply(entry.getValue().divide(totalMaker, 2, RoundingMode.HALF_UP));
+
+ OnlineTransferUtil.addTransfer(entry.getKey(), target, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+
+ DappFundFlowEntity distribFlow = new DappFundFlowEntity(addressAndId.get(entry.getKey()), target, 4, 2, BigDecimal.ZERO);
+ dappFundFlowDao.insert(distribFlow);
+ }
+ }
+ }
+
+
// 若节点金额还有剩余，则进入技术金额
techAmount = techAmount.add(nodeAmount);
- OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount, fundflow.getType(), 2, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+ OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount, fundflow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
Map<String, String> map = new HashMap<>();
map.put("batchNo", batchNo);
@@ -255,7 +294,7 @@
}
// 挖矿数量
- BigDecimal mine = transferPoll.multiply(balance.divide(allInternet, instance.decimals(), RoundingMode.HALF_UP));
+ BigDecimal mine = transferPoll.multiply(new BigDecimal("0.2")).multiply(balance.divide(allInternet, instance.decimals(), RoundingMode.HALF_UP));
if (mine.compareTo(BigDecimal.ZERO) < 1) {
continue;
}
@@ -367,8 +406,6 @@
chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
}
- @Autowired
- private SystemTradeJob systemTradeJob;
@Override
public void startSystem() {
@@ -377,11 +414,99 @@
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
- systemTradeJob.transferPoolVol();
- systemTradeJob.sourcePoolUsdtOutLimit();
+ transferPoolSetting();
+ sourcePoolUsdtOutLimitSetting();
}
});
thread.start();
}
+
+ // 最低容量(百分比)
+ private final BigDecimal volProp = new BigDecimal("2");
+ // 每日增/减百分比
+ private final BigDecimal changeProp = new BigDecimal("1");
+
+ @Override
+ public void transferPoolSetting() {
+ String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
+ if (!"start".equals(hasStart)) {
+ log.info("系统未启动");
+ return;
+ }
+
+ // 源池初始化容量
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_SYSTEM_SOURCE_POOL_VOL);
+ BigDecimal basicVol = new BigDecimal(dic.getValue());
+
+ Object o = redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
+ if (o == null) {
+ RedisTransferPoolVo transferPool= new RedisTransferPoolVo();
+ BigDecimal total = basicVol.multiply(volProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
+ transferPool.setTodayVol(total);
+ transferPool.setTodayProp(volProp);
+ transferPool.setFinishCnt(0);
+ transferPool.setUnFinishCnt(0);
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL, transferPool);
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, total);
+
+ redisUtils.set(AppContants.REDIS_KEY_MINE_TRANSFER_POOL_TRADE_CNT, BigDecimal.ZERO);
+ return;
+ }
+
+ RedisTransferPoolVo transferPool = (RedisTransferPoolVo) o;
+ BigDecimal remain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
+
+ // 设置当日成交量
+ redisUtils.set(AppContants.REDIS_KEY_MINE_TRANSFER_POOL_TRADE_CNT, transferPool.getTodayVol().subtract(remain));
+
+ // 全卖了
+ if (remain.compareTo(BigDecimal.ZERO) == 0) {
+ int finishCnt = transferPool.getFinishCnt() + 1;
+ BigDecimal targetProp = transferPool.getTodayProp();
+ if (finishCnt == 1) {
+ targetProp = transferPool.getTodayVol().add(changeProp);
+ transferPool.setTodayProp(targetProp);
+ transferPool.setFinishCnt(0);
+ } else {
+ transferPool.setFinishCnt(finishCnt);
+ }
+
+ BigDecimal total = basicVol.multiply(targetProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
+ transferPool.setTodayVol(total);
+ transferPool.setUnFinishCnt(0);
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, total);
+
+ } else {
+ int unFinishCnt = transferPool.getUnFinishCnt() + 1;
+ BigDecimal targetProp = transferPool.getTodayProp();
+ if (unFinishCnt >= 1) {
+ targetProp = transferPool.getTodayProp().compareTo(volProp) == 0 ? volProp : transferPool.getTodayProp().subtract(changeProp);
+ transferPool.setTodayProp(targetProp);
+ transferPool.setUnFinishCnt(0);
+ } else {
+ transferPool.setUnFinishCnt(unFinishCnt);
+ }
+ BigDecimal aa = targetProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP);
+ BigDecimal total = basicVol.multiply(aa);
+ transferPool.setTodayVol(total);
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, total);
+ }
+
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL, transferPool);
+ }
+
+ @Override
+ public void sourcePoolUsdtOutLimitSetting() {
+ String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
+ if (!"start".equals(hasStart)) {
+ log.info("系统未启动");
+ return;
+ }
+ BigDecimal sourceBalance = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+
+ BigDecimal total = sourceBalance.multiply(BigDecimal.valueOf(0.1)).setScale(4, RoundingMode.HALF_DOWN);
+ redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT, total);
+ redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, total);
+ }
}
--
Gitblit v1.9.1