From a7aca2f0ae9455d23a7c8c5c5f2a6210b6e1fb4f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 18:31:09 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 85 ++++--------------------------------------
1 files changed, 9 insertions(+), 76 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 033e34e..21ccecd 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
@@ -103,80 +103,7 @@
DappMemberEntity member = LoginUserUtil.getAppUser();
SystemDto system = new SystemDto();
- String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
- // 启动未启动
- if (!"start".equals(hasStart)) {
- system.setFeeRatio(new BigDecimal("7"));
- system.setBuyFeeRatio(new BigDecimal("3"));
- 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.name()).balanceOf(ChainEnum.BSC_TFC.getAddress());
- redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, balance);
- } else {
- balance = (BigDecimal) makePoolObj;
- }
- 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;
- }
-
- RedisTransferPoolVo transferPool = (RedisTransferPoolVo) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
- BigDecimal poolRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
- // 买币数量
- system.setBuyTotal(transferPool.getTodayVol());
- system.setBuyRemain(poolRemain);
-
- ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
- BigDecimal balance = instance.balanceOf(member.getAddress());
-
- Object o = redisUtils.get(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress());
-
- 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());
- long time = DateUtil.between(new Date(), tomorrow, DateUnit.SECOND, true);
-
- remain = coinTotal;
- redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), remain, time);
- } else {
- remain = (BigDecimal) o;
- }
- // 卖币数量
- system.setSaleTotal(coinTotal);
- system.setSaleRemain(remain);
-
- BigDecimal usdtRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN);
- BigDecimal usdtTotal = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_USDT_OUT_LIMIT);
-
- // usdt数量
- system.setUsdtTotal(usdtTotal);
- system.setUsdtRemain(usdtRemain);
-
- system.setFeeRatio(new BigDecimal("7"));
- system.setBuyFeeRatio(new BigDecimal("3"));
+ system.setBuyAmount(new BigDecimal("100"));
return system;
}
@@ -753,8 +680,14 @@
achieveMemberTree.setTopNode(memberId);
achieveMemberTree.setDeep(1);
achieveMemberTree.setHasMoney(1);
- achieveMemberTree.setParentNode(parentNode.getMemberId());
+ if (parentNode != null) {
+ achieveMemberTree.setParentNode(parentNode.getMemberId());
+ }
dappAchieveMemberTreeDao.insert(achieveMemberTree);
+
+ if (parentNode == null) {
+ return;
+ }
// 修改父节点在数据库中的左/右节点数据
DappAchieveTreeEntity treeMidNode = dappAchieveTreeDao.selectByMidNode(parentNode.getMemberId());
@@ -794,7 +727,7 @@
// 完成矩阵树，并重置矩阵且重入
public void finishMatrixTree(Long memberId) {
- List<DappAchieveMemberTreeEntity> matrixTree = dappAchieveMemberTreeDao.selectMatrixTreeByTopNode(memberId);
+ List<DappAchieveMemberTreeEntity> matrixTree = dappAchieveMemberTreeDao.selectMatrixTreeByTopNode(memberId, 1);
// 如果达到标准，则重置该矩阵树
if (matrixTree.size() == 7) {
dappAchieveMemberTreeDao.resetMatrixTree(memberId);
--
Gitblit v1.9.1