From 2ef014198d8fbbf0a54ca5666577e75d26950f12 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 02 Aug 2022 01:34:20 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 845bbb5..ec08f1c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -16,6 +16,7 @@
import cc.mrbird.febs.dapp.dto.WalletOperateDto;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.mapper.*;
+import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.BoxUtil;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
@@ -49,6 +50,7 @@
private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
private final RedisUtils redisUtils;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final DappSystemService dappSystemService;
@Override
public WalletInfoVo walletInfo() {
@@ -60,12 +62,15 @@
List<DappMemberEntity> notDirect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2);
BigDecimal childHoldAmount = dappMemberDao.selectChildHoldAmount(member.getInviteId());
+ DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
+
walletInfo.setTotalChild(notDirect.size());
walletInfo.setDirectCnt(direct.size());
walletInfo.setTotalChildCoin(childHoldAmount);
walletInfo.setTeamReward(map.get("teamReward"));
walletInfo.setMiningAmount(map.get("mine"));
walletInfo.setInviteId(member.getInviteId());
+ walletInfo.setBoxCnt(walletCoin.getBoxCnt());
return walletInfo;
}
@@ -316,12 +321,10 @@
public Map<String, BigDecimal> calPrice(PriceDto priceDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
-
- String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
- if (!"start".equals(hasStart)) {
+ if (!dappSystemService.systemHasStart()) {
HashMap<String, BigDecimal> map = new HashMap<>();
- map.put("x", new BigDecimal("0.075"));
- map.put("y", new BigDecimal("100000"));
+ map.put("x", new BigDecimal("0.05"));
+ map.put("y", new BigDecimal("0.05"));
return map;
}
@@ -330,7 +333,7 @@
BigDecimal sourceU = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
// 源池代币剩余数量
BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
- // 用户代币剩余数量
+ // 用户卖出数量
BigDecimal coin = priceDto.getAmount();
BigDecimal x = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_UP);
BigDecimal y = sourceU.divide(sourceCoin.add(coin), tfcInstance.decimals(), RoundingMode.HALF_UP);
--
Gitblit v1.9.1