From 3df9ce1cd79e43fbc1036e8ee8414de711e97eb0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Aug 2022 09:56:12 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 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 95383f1..9fc1c1c 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.ContractChainService;
import cc.mrbird.febs.dapp.dto.SystemDto;
import cc.mrbird.febs.dapp.entity.*;
+import cc.mrbird.febs.dapp.enumerate.CardPeriod;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.utils.OnlineTransferUtil;
@@ -41,7 +42,7 @@
import java.util.*;
/**
- * @author
+ * @author
* @date 2022-03-24
**/
@Slf4j
@@ -74,6 +75,8 @@
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()));
+ result.put("cardCnt", 1000);
+ result.put("nftPrice", AppContants.NFT_ACTIVE_PRICE);
return result;
}
@@ -98,7 +101,8 @@
String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
// 启动未启动
if (!"start".equals(hasStart)) {
- system.setFeeRatio(BigDecimal.TEN);
+ system.setFeeRatio(new BigDecimal("7"));
+ system.setBuyFeeRatio(new BigDecimal("3"));
system.setUsdtRemain(BigDecimal.ZERO);
system.setUsdtTotal(BigDecimal.ZERO);
system.setSaleRemain(BigDecimal.ZERO);
@@ -113,6 +117,15 @@
}
system.setBuyRemain(balance);
system.setBuyTotal(balance);
+
+
+ Object maxDailyBuy = redisUtils.get(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress());
+ if (maxDailyBuy == null) {
+ DateTime tomorrow = DateUtil.beginOfDay(DateUtil.tomorrow());
+ long time = DateUtil.between(new Date(), tomorrow, DateUnit.SECOND, true);
+
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), new BigDecimal("1000"), time);
+ }
return system;
}
@@ -176,7 +189,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 +284,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 {
@@ -296,6 +346,10 @@
ContractChainService contract = ChainService.getInstance(ChainEnum.BSC_TFC.name());
// 发行量
BigInteger totalSupply = contract.totalSupply();
+
+ if (!systemHasStart()) {
+ return;
+ }
BigDecimal totalUnHold = contract.balanceOf(AppContants.DESTROY_ADDRESS);
List<DappMemberEntity> admin = dappMemberDao.selectMemberByAccountType("admin");
@@ -487,7 +541,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);
@@ -563,12 +617,12 @@
lastDayPrice = new BigDecimal(dailyPrice);
}
- ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
+ ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC_SOURCE.name());
// 源池币种数量
- BigDecimal tfcBalance = tfcInstance.balanceOf(ChainEnum.BSC_TFC.getAddress());
+ BigDecimal tfcBalance = tfcInstance.balanceOf(ChainEnum.BSC_TFC_SOURCE.getAddress());
// 源池USDT数量
- BigDecimal usdtBalance = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT.getAddress());
+ BigDecimal usdtBalance = ChainService.getInstance(ChainEnum.BSC_USDT_SOURCE.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
BigDecimal todayPrice = tfcBalance.divide(usdtBalance, tfcInstance.decimals(), RoundingMode.HALF_UP);
@@ -601,7 +655,7 @@
return;
}
- DataDictionaryCustom boxRecommendCnt = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_BOX_RECOMMEND_CNT);
+ BigInteger totalSupply = ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).totalSupplyNFT();
int box = 0;
// 需要第一次购买，才在推荐中加1
Object parentRecommend = redisUtils.hget(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress());
@@ -611,7 +665,7 @@
int i = (int) parentRecommend;
// 如果超过10个，则新增一个盲盒，并重置推荐人数
- if (++i == new Integer(boxRecommendCnt.getValue())) {
+ if (++i == CardPeriod.ONE.recommendCnt(totalSupply.intValue())) {
box = 1;
redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), 0);
} else {
--
Gitblit v1.9.1