From db1734ef2e2da94c027bcb9e31ad7a5d13c3c8f9 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 10 Nov 2022 22:05:10 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 132 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 19 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 37baa79..2536f0d 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
@@ -12,6 +12,7 @@
import cc.mrbird.febs.dapp.chain.ContractChainService;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.BoxUtil;
@@ -54,8 +55,10 @@
private final RedisUtils redisUtils;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final DappNftActivationDao dappNftActivationDao;
+ private final MemberCoinWithdrawDao memberCoinWithdrawDao;
private final ChainProducer chainProducer;
+ private final DappSystemDao dappSystemDao;
@Override
public WalletInfoVo walletInfo() {
@@ -63,10 +66,11 @@
DappMemberEntity memberInfo = dappMemberDao.selectById(member.getId());
WalletInfoVo walletInfo = new WalletInfoVo();
- List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1);
+ List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, null);
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
+ DappMineDataEntity mineData = dappSystemDao.selectMineDataForOne();
walletInfo.setDirectCnt(direct.size());
walletInfo.setInviteId(member.getActiveStatus() == 1 ? member.getInviteId() : "-");
walletInfo.setBalance(walletCoin.getAvailableAmount());
@@ -74,7 +78,7 @@
walletInfo.setOutCnt(memberInfo.getOutCnt());
walletInfo.setProfit(dappFundFlowDao.selectProfitAmountByMemberId(member.getId()));
walletInfo.setTfcBalance(walletMine.getAvailableAmount());
-
+ walletInfo.setSafePool(mineData.getSafePool());
return walletInfo;
}
@@ -88,7 +92,7 @@
dappFundFlowEntity.setType(recordInPageDto.getType());
}
dappFundFlowEntity.setMemberId(member.getId());
- dappFundFlowEntity.setStatus(2);
+// dappFundFlowEntity.setStatus(2);
IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
return records.getRecords();
@@ -122,6 +126,11 @@
public Long transfer(TransferDto transferDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
+ String upgrade = redisUtils.getString("APP_UPGRADE");
+ if ("upgrade".equals(upgrade)) {
+ throw new FebsException("功能升级中");
+ }
+
if (transferDto.getType() != 2) {
member = dappMemberDao.selectById(member.getId());
if (member.getActiveStatus() == 1) {
@@ -135,7 +144,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);
@@ -169,16 +178,19 @@
@Override
public BigDecimal calPrice(PriceDto priceDto) {
- String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE);
+// String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE);
+ DataDictionaryCustom symbolPrice = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode());
+ DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode());
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);
+ return amount.multiply(new BigDecimal(serviceFeeDic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN)).divide(new BigDecimal(symbolPrice.getValue()), 2, RoundingMode.HALF_UP);
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void withdraw(WithdrawDto withdrawDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -189,11 +201,12 @@
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
if (walletMine.getAvailableAmount().compareTo(withdrawDto.getFee()) < 0) {
- throw new FebsException("TFC Not Enough");
+ throw new FebsException("DMD Not Enough");
}
- updateWalletCoinWithLock(withdrawDto.getAmount().negate(), member.getId());
- updateWalletMineWithLock(withdrawDto.getFee().negate(), member.getId());
+ 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);
@@ -201,24 +214,46 @@
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 5, 2, withdrawDto.getFee(), null);
dappFundFlowDao.insert(fundFlow);
+ MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity();
+ memberCoinWithdraw.setMemberId(member.getId());
+ memberCoinWithdraw.setAddress(member.getAddress());
+ memberCoinWithdraw.setAmount(withdrawDto.getAmount());
+ memberCoinWithdraw.setFeeAmount(withdrawDto.getFee());
+ memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
+ memberCoinWithdraw.setSymbol("USDT");
+ memberCoinWithdraw.setFlowId(fundFlow.getId());
+ memberCoinWithdrawDao.insert(memberCoinWithdraw);
+
String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(member.getAddress(), withdrawDto.getAmount());
fundFlow.setToHash(hash);
dappFundFlowDao.updateById(fundFlow);
- Map<String, Object> map = new HashMap<>();
- map.put("fee", withdrawDto.getFee());
- map.put("address", ChainEnum.BSC_TFC_FEE.getAddress());
- chainProducer.sendTfcFee(JSONObject.toJSONString(map));
+ chainProducer.sendFeeDistributeMsg(fundFlow.getId());
+// 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) {
@@ -228,13 +263,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("DMD Not Enough");
+ }
+ walletMine.setTotalAmount(walletMine.getTotalAmount().subtract(amount));
+ walletMine.setAvailableAmount(walletMine.getAvailableAmount().subtract(amount));
+ }
int i = dappWalletMineDao.updateWithLock(walletMine);
if (i > 0) {
@@ -242,4 +285,55 @@
}
}
}
+
+ @Override
+ public void addFrozenAmountWithLock(BigDecimal amount, Long memberId) {
+ boolean isSuccess = false;
+ while(!isSuccess) {
+ DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(memberId);
+
+ walletCoin.setTotalAmount(walletCoin.getTotalAmount().add(amount));
+ walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().add(amount));
+
+ int i = dappWalletCoinDao.updateWithLock(walletCoin);
+ if (i > 0) {
+ isSuccess = true;
+
+ DappFundFlowEntity frozenAmount = new DappFundFlowEntity(memberId, amount, 9, 2, null, null);
+ dappFundFlowDao.insert(frozenAmount);
+ }
+ }
+ }
+
+ @Override
+ public void releaseFrozenAmountWithLock(Long memberId) {
+ boolean isSuccess = false;
+ while(!isSuccess) {
+ DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(memberId);
+
+ if (walletCoin.getFrozenAmount().compareTo(BigDecimal.ZERO) <= 0) {
+ return;
+ }
+ BigDecimal frozen = walletCoin.getFrozenAmount();
+
+ walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(frozen));
+ walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().subtract(frozen));
+
+ int i = dappWalletCoinDao.updateWithLock(walletCoin);
+ if (i > 0) {
+ isSuccess = true;
+
+ DappFundFlowEntity releaseFrozen = new DappFundFlowEntity(memberId, frozen, 10, 2, null, null);
+ dappFundFlowDao.insert(releaseFrozen);
+
+ DappFundFlowEntity releaseFrozenNegate = new DappFundFlowEntity(memberId, frozen.negate(), 9, 2, null, null);
+ dappFundFlowDao.insert(releaseFrozenNegate);
+ }
+ }
+ }
+
+ @Override
+ public DappWalletCoinEntity findByMemberId(Long memberId) {
+ return dappWalletCoinDao.selectByMemberId(memberId);
+ }
}
--
Gitblit v1.9.1