From 69e44659412c7868592331d3b1570b87147b4025 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Aug 2022 12:45:26 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 106 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 37 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..0a44401 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;
}
@@ -219,6 +224,10 @@
BigDecimal usdtRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN);
// 用户24小时可出售量
BigDecimal saleCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress());
+
+ // 用户24小时可购买USDT
+ BigDecimal buyUsdtMax = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress());
+
BigDecimal buyCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
// 铸池中的币的剩余量
BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
@@ -246,6 +255,11 @@
// 修改用户24小时可售量
redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
} else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
+ // 购买时，前端传来的amount是USDT，卖出amount是TFC
+ BigDecimal usdtAmount = transferDto.getAmount();
+ BigDecimal coinAmount = transferDto.getAmount().divide(transferDto.getPrice(), 6, RoundingMode.HALF_UP);
+ transferDto.setAmount(coinAmount);
+
if ("start".equals(hasStart)) {
if (transferDto.getAmount().compareTo(buyCoinRemain) > 0) {
throw new FebsException(MessageSourceUtils.getString("transfer_msg_004"));
@@ -256,15 +270,24 @@
redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
// 如果系统还没有启动，则判断铸池中的剩余量
} else {
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MAKER_MIN_LIMIT);
- if (transferDto.getAmount().compareTo(new BigDecimal(dic.getValue())) < 0) {
- throw new FebsException(MessageSourceUtils.getString("transfer_msg_005"));
+ // 最少购买
+// DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MAKER_MIN_LIMIT);
+// if (transferDto.getAmount().compareTo(new BigDecimal(dic.getValue())) < 0) {
+// throw new FebsException(MessageSourceUtils.getString("transfer_msg_005"));
+// }
+
+ if (buyUsdtMax.compareTo(usdtAmount) < 0) {
+ throw new FebsException(MessageSourceUtils.getString("transfer_msg_007"));
}
if (transferDto.getAmount().compareTo(makeCoinRemain) > 0) {
throw new FebsException(MessageSourceUtils.getString("transfer_msg_006"));
}
makeCoinRemain = makeCoinRemain.subtract(transferDto.getAmount());
+ buyUsdtMax = buyUsdtMax.subtract(usdtAmount);
+
+ // 修改每日最大购买USDT量
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
// 修改铸池量
redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
@@ -286,6 +309,11 @@
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
if (flow.getStatus() == 1) {
if (DappFundFlowEntity.TYPE_BUY == flow.getType()) {
+ // 购买时，前端传来的amount是USDT，卖出amount是TFC
+ BigDecimal usdtAmount = transferDto.getAmount();
+ BigDecimal coinAmount = transferDto.getAmount().divide(flow.getNewestPrice(), 6, RoundingMode.HALF_UP);
+ transferDto.setAmount(coinAmount);
+
if ("start".equals(hasStart)) {
buyCoinRemain = buyCoinRemain.add(flow.getAmount());
@@ -293,9 +321,11 @@
redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
} else {
makeCoinRemain = makeCoinRemain.add(flow.getAmount());
+ buyUsdtMax = buyUsdtMax.add(usdtAmount);
// 修改铸池量
redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
}
} else {
usdtRemain = usdtRemain.add(transferDto.getAmount().multiply(transferDto.getPrice()));
@@ -316,12 +346,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 +358,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);
@@ -344,35 +372,39 @@
@Override
public int boxSurprise() {
- DappMemberEntity member = LoginUserUtil.getAppUser();
- DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
- if (walletCoin.getBoxCnt() < 1) {
- throw new FebsException("盲盒数量不足");
- }
+ // 功能升级
+ throw new FebsException(MessageSourceUtils.getString("box_surprise_002"));
- walletCoin.setBoxCnt(walletCoin.getBoxCnt() - 1);
- dappWalletCoinDao.updateById(walletCoin);
-
- BoxUtil.Box box = BoxUtil.openBox();
-
- DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(box.getIndex()), 6, 2, BigDecimal.ZERO);
- dappFundFlowDao.insert(boxFundFlow);
-
- new Thread(() -> {
- try {
- int count = box.getIndex();
- while (count > 0) {
- ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
- Thread.sleep(5000);
- count--;
- }
- } catch (Exception e) {
- e.printStackTrace();
- log.error("发放卡牌错误", e);
- }
- }).start();
-
- return box.getIndex();
+// DappMemberEntity member = LoginUserUtil.getAppUser();
+//
+// DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
+// if (walletCoin.getBoxCnt() < 1) {
+// throw new FebsException(MessageSourceUtils.getString("box_surprise_001"));
+// }
+//
+// walletCoin.setBoxCnt(walletCoin.getBoxCnt() - 1);
+// dappWalletCoinDao.updateById(walletCoin);
+//
+// BoxUtil.Box box = BoxUtil.openBox();
+//
+// DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(box.getIndex()), 6, 2, BigDecimal.ZERO);
+// dappFundFlowDao.insert(boxFundFlow);
+//
+// new Thread(() -> {
+// try {
+// int count = box.getIndex();
+// while (count > 0) {
+// ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
+// Thread.sleep(5000);
+// count--;
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// log.error("发放卡牌错误", e);
+// }
+// }).start();
+//
+// return box.getIndex();
}
}
--
Gitblit v1.9.1