From ad9d61bc5a10becf6aaf87baf7832bcdd10e561e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Aug 2022 14:20:54 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 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 8268809..ebebddf 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
@@ -22,6 +22,7 @@
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -55,6 +56,7 @@
private final DappNftActivationDao dappNftActivationDao;
private final ChainProducer chainProducer;
+ private final DappSystemDao dappSystemDao;
@Override
public WalletInfoVo walletInfo() {
@@ -66,14 +68,15 @@
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
+ DappMineDataEntity mineData = dappSystemDao.selectMineDataForOne();
walletInfo.setDirectCnt(direct.size());
- walletInfo.setInviteId(member.getInviteId());
+ walletInfo.setInviteId(member.getActiveStatus() == 1 ? member.getInviteId() : "-");
walletInfo.setBalance(walletCoin.getAvailableAmount());
walletInfo.setHasBuy(memberInfo.getActiveStatus());
walletInfo.setOutCnt(memberInfo.getOutCnt());
walletInfo.setProfit(dappFundFlowDao.selectProfitAmountByMemberId(member.getId()));
walletInfo.setTfcBalance(walletMine.getAvailableAmount());
-
+ walletInfo.setSafePool(mineData.getSafePool());
return walletInfo;
}
@@ -134,7 +137,7 @@
throw new FebsException("Balance Not Enough");
}
- updateWalletCoinWithLock(transferDto.getAmount().negate(), member.getId());
+ updateWalletCoinWithLock(transferDto.getAmount(), member.getId(), 2);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount().negate(), 1, 2, transferDto.getFee(), transferDto.getTxHash());
dappFundFlowDao.insert(fundFlow);
@@ -170,15 +173,30 @@
public BigDecimal calPrice(PriceDto priceDto) {
String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE);
- return priceDto.getAmount().multiply(new BigDecimal("0.1")).multiply(new BigDecimal(priceStr));
+ BigDecimal amount = priceDto.getAmount();
+ if (priceDto.getAmount() == null) {
+ amount = BigDecimal.ZERO;
+ }
+ return amount.multiply(new BigDecimal("0.1")).divide(new BigDecimal(priceStr), 2, RoundingMode.HALF_UP);
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void withdraw(WithdrawDto withdrawDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
- updateWalletCoinWithLock(withdrawDto.getAmount().negate(), member.getId());
- updateWalletMineWithLock(withdrawDto.getFee().negate(), member.getId());
+ DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
+ if (walletCoin.getAvailableAmount().compareTo(withdrawDto.getAmount()) < 0) {
+ throw new FebsException("Balance Not Enough");
+ }
+
+ DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
+ if (walletMine.getAvailableAmount().compareTo(withdrawDto.getFee()) < 0) {
+ throw new FebsException("TFC Not Enough");
+ }
+
+ updateWalletCoinWithLock(withdrawDto.getAmount(), member.getId(), 2);
+ updateWalletMineWithLock(withdrawDto.getFee(), member.getId(), 2);
DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 7, 2, null, null);
dappFundFlowDao.insert(feeFlow);
@@ -190,17 +208,31 @@
fundFlow.setToHash(hash);
dappFundFlowDao.updateById(fundFlow);
- chainProducer.sendTfcFee(withdrawDto.getFee().toPlainString());
+ Map<String, Object> map = new HashMap<>();
+ map.put("fee", withdrawDto.getFee());
+ map.put("address", ChainEnum.BSC_TFC_FEE.getAddress());
+ map.put("flow", feeFlow.getId());
+ chainProducer.sendTfcFee(JSONObject.toJSONString(map));
}
@Override
- public void updateWalletCoinWithLock(BigDecimal amount, Long memberId) {
+ public void updateWalletCoinWithLock(BigDecimal amount, Long memberId, int type) {
boolean isSuccess = false;
while(!isSuccess) {
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(memberId);
- walletCoin.setTotalAmount(walletCoin.getTotalAmount().add(amount));
- walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(amount));
+ // 加
+ if (type == 1) {
+ walletCoin.setTotalAmount(walletCoin.getTotalAmount().add(amount));
+ walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(amount));
+ // 减
+ } else {
+ if (amount.compareTo(walletCoin.getAvailableAmount()) < 0) {
+ throw new FebsException("Balance Not Enough");
+ }
+ walletCoin.setTotalAmount(walletCoin.getTotalAmount().subtract(amount));
+ walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().subtract(amount));
+ }
int i = dappWalletCoinDao.updateWithLock(walletCoin);
if (i > 0) {
@@ -210,13 +242,21 @@
}
@Override
- public void updateWalletMineWithLock(BigDecimal amount, Long memberId) {
+ public void updateWalletMineWithLock(BigDecimal amount, Long memberId, int type) {
boolean isSuccess = false;
while(!isSuccess) {
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(memberId);
- walletMine.setTotalAmount(walletMine.getTotalAmount().add(amount));
- walletMine.setAvailableAmount(walletMine.getAvailableAmount().add(amount));
+ if (type == 1) {
+ walletMine.setTotalAmount(walletMine.getTotalAmount().add(amount));
+ walletMine.setAvailableAmount(walletMine.getAvailableAmount().add(amount));
+ } else {
+ if (amount.compareTo(walletMine.getAvailableAmount()) < 0) {
+ throw new FebsException("TFC Not Enough");
+ }
+ walletMine.setTotalAmount(walletMine.getTotalAmount().subtract(amount));
+ walletMine.setAvailableAmount(walletMine.getAvailableAmount().subtract(amount));
+ }
int i = dappWalletMineDao.updateWithLock(walletMine);
if (i > 0) {
--
Gitblit v1.9.1