From 5fd13393f000ff3b643823b4ba4374b2e31e2d3a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Nov 2022 11:43:42 +0800
Subject: [PATCH] 20221124
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 26758fc..4804921 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
@@ -66,7 +66,7 @@
DappMemberEntity memberInfo = dappMemberDao.selectById(member.getId());
WalletInfoVo walletInfo = new WalletInfoVo();
- List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, null);
+ List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
@@ -186,7 +186,7 @@
if (priceDto.getAmount() == null) {
amount = BigDecimal.ZERO;
}
- return amount.multiply(new BigDecimal(serviceFeeDic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN)).divide(new BigDecimal(symbolPrice.getValue()), 2, RoundingMode.HALF_UP);
+ return amount.multiply(new BigDecimal(serviceFeeDic.getValue()).divide(BigDecimal.valueOf(100), 8, RoundingMode.HALF_DOWN)).divide(new BigDecimal(symbolPrice.getValue()), 2, RoundingMode.HALF_UP);
}
@Override
@@ -211,7 +211,7 @@
DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 7, 2, null, null);
dappFundFlowDao.insert(feeFlow);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 5, 1, withdrawDto.getFee(), null);
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 5, 2, withdrawDto.getFee(), null);
dappFundFlowDao.insert(fundFlow);
MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity();
@@ -219,15 +219,16 @@
memberCoinWithdraw.setAddress(member.getAddress());
memberCoinWithdraw.setAmount(withdrawDto.getAmount());
memberCoinWithdraw.setFeeAmount(withdrawDto.getFee());
- memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
+ 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);
+ String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(member.getAddress(), withdrawDto.getAmount());
+ fundFlow.setToHash(hash);
+ dappFundFlowDao.updateById(fundFlow);
+ chainProducer.sendFeeDistributeMsg(fundFlow.getId());
// Map<String, Object> map = new HashMap<>();
// map.put("fee", withdrawDto.getFee());
// map.put("address", ChainEnum.BSC_TFC_FEE.getAddress());
--
Gitblit v1.9.1