From a57b2756ee1843be1c230959f5534e8d90abc463 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 26 Jul 2022 17:44:08 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 91 +++++++++++++++++++++++++++++----------------
1 files changed, 58 insertions(+), 33 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 40a8ece..efd0b74 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.service.impl;
+import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
@@ -9,6 +10,7 @@
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.chain.ContractChainService;
+import cc.mrbird.febs.dapp.dto.PriceDto;
import cc.mrbird.febs.dapp.dto.RecordInPageDto;
import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.dto.WalletOperateDto;
@@ -45,6 +47,7 @@
private final DappFundFlowDao dappFundFlowDao;
private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
private final RedisUtils redisUtils;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
public WalletInfoVo walletInfo() {
@@ -142,6 +145,8 @@
dappFundFlowEntity.setType(recordInPageDto.getType());
}
dappFundFlowEntity.setMemberId(member.getId());
+ dappFundFlowEntity.setStatus(2);
+
IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
return records.getRecords();
}
@@ -221,27 +226,47 @@
if (transferDto.getId() == null) {
if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
if (!"start".equals(hasStart)) {
- throw new FebsException("系统还未启动");
+ throw new FebsException(MessageSourceUtils.getString("transfer_msg_001"));
}
if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) {
- throw new FebsException("超过当日出U剩余量");
+ throw new FebsException(MessageSourceUtils.getString("transfer_msg_002"));
}
if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) {
- throw new FebsException("超出24小时内可售量");
+ throw new FebsException(MessageSourceUtils.getString("transfer_msg_003"));
}
+ usdtRemain = usdtRemain.subtract(transferDto.getAmount().multiply(transferDto.getPrice()));
+ saleCoinRemain = saleCoinRemain.subtract(transferDto.getAmount());
+
+ // 修改当日U剩余量
+ redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
+ // 修改用户24小时可售量
+ redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
} else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
if ("start".equals(hasStart)) {
if (transferDto.getAmount().compareTo(buyCoinRemain) > 0) {
- throw new FebsException("超过当日可购买量");
+ throw new FebsException(MessageSourceUtils.getString("transfer_msg_004"));
}
+ buyCoinRemain = buyCoinRemain.subtract(transferDto.getAmount());
+
+ // 修改当日可购买量
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
// 如果系统还没有启动，则判断铸池中的剩余量
} else {
- if (transferDto.getAmount().compareTo(makeCoinRemain) > 0) {
- throw new FebsException("可购数量不足");
+ 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 (transferDto.getAmount().compareTo(makeCoinRemain) > 0) {
+ throw new FebsException(MessageSourceUtils.getString("transfer_msg_006"));
+ }
+ makeCoinRemain = makeCoinRemain.subtract(transferDto.getAmount());
+
+ // 修改铸池量
+ redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
}
}
@@ -256,38 +281,38 @@
flow.setFromHash(transferDto.getTxHash());
dappFundFlowDao.updateById(flow);
-
- if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
- usdtRemain = usdtRemain.subtract(flow.getAmount().multiply(flow.getNewestPrice()));
- saleCoinRemain = saleCoinRemain.subtract(flow.getAmount());
-
- // 修改当日U剩余量
- redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
- // 修改用户24小时可售量
- redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
- } else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
- if ("start".equals(hasStart)) {
- buyCoinRemain = buyCoinRemain.subtract(flow.getAmount());
-
- // 修改当日可购买量
- redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
- } else {
- makeCoinRemain = makeCoinRemain.subtract(flow.getAmount());
-
- // 修改铸池量
- redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
- }
- } else {
- throw new FebsException("参数错误");
- }
} else {
- dappFundFlowDao.deleteById(transferDto.getId());
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+ if (flow.getStatus() == 1) {
+ if (DappFundFlowEntity.TYPE_BUY == flow.getType()) {
+ if ("start".equals(hasStart)) {
+ buyCoinRemain = buyCoinRemain.add(flow.getAmount());
+
+ // 修改当日可购买量
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
+ } else {
+ makeCoinRemain = makeCoinRemain.add(flow.getAmount());
+
+ // 修改铸池量
+ redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
+ }
+ } else {
+ usdtRemain = usdtRemain.add(transferDto.getAmount().multiply(transferDto.getPrice()));
+ saleCoinRemain = saleCoinRemain.add(transferDto.getAmount());
+
+ // 修改当日U剩余量
+ redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
+ // 修改用户24小时可售量
+ redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
+ }
+ dappFundFlowDao.deleteById(transferDto.getId());
+ }
}
return null;
}
@Override
- public Map<String, BigDecimal> calPrice() {
+ public Map<String, BigDecimal> calPrice(PriceDto priceDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -305,7 +330,7 @@
// 源池代币剩余数量
BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
// 用户代币剩余数量
- BigDecimal coin = tfcInstance.balanceOf(member.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