From a9ad17c465e0d485b8195dd1343813f550fcbc6f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 26 Jul 2022 17:41:17 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 78 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 31 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 34fcf4a..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;
@@ -225,32 +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 {
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("未达到最低购买要求");
+ throw new FebsException(MessageSourceUtils.getString("transfer_msg_005"));
}
if (transferDto.getAmount().compareTo(makeCoinRemain) > 0) {
- throw new FebsException("可购数量不足");
+ throw new FebsException(MessageSourceUtils.getString("transfer_msg_006"));
}
+ makeCoinRemain = makeCoinRemain.subtract(transferDto.getAmount());
+
+ // 修改铸池量
+ redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
}
}
@@ -265,32 +281,32 @@
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;
}
--
Gitblit v1.9.1