From e1992f204a135a347a89a5859a8fe54033401b7e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 30 May 2022 16:34:05 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 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 fde1fbb..92ae21b 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
@@ -3,9 +3,14 @@
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
+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.RecordInPageDto;
+import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.dto.WalletOperateDto;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.mapper.*;
@@ -20,10 +25,13 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
- * @author wzy
+ * @author
* @date 2022-03-18
**/
@Slf4j
@@ -40,15 +48,18 @@
@Override
public WalletInfoVo walletInfo() {
- DappMemberEntity member = LoginUserUtil.getAppUser();
-
- DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
- DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
+// DappMemberEntity member = LoginUserUtil.getAppUser();
+// DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
+// DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
WalletInfoVo walletInfo = new WalletInfoVo();
- walletInfo.setTotalMine(walletMine.getTotalAmount());
- walletInfo.setAvailableMine(walletMine.getAvailableAmount());
- walletInfo.setAvailableWallet(walletCoin.getAvailableAmount());
+// walletInfo.setInviteId(member.getInviteId());
+// walletInfo.setTotalMine(walletMine.getTotalAmount());
+// walletInfo.setAvailableMine(walletMine.getAvailableAmount());
+// walletInfo.setAvailableWallet(walletCoin.getAvailableAmount());
+
+ walletInfo.setTotalChild(10000);
+ walletInfo.setTotalChild(41451);
return walletInfo;
}
@@ -112,7 +123,7 @@
walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().add(walletOperateDto.getAmount()));
dappWalletCoinDao.updateById(walletCoin);
- DappFundFlowEntity fund = new DappFundFlowEntity(member.getId(), walletOperateDto.getAmount(), AppContants.MONEY_TYPE_WITHDRAWAL, 1, fee);
+ DappFundFlowEntity fund = new DappFundFlowEntity(member.getId(), walletOperateDto.getAmount(), AppContants.MONEY_TYPE_WITHDRAWAL, 1, new BigDecimal(fee));
dappFundFlowDao.insert(fund);
DappAccountMoneyChangeEntity usdtChange = new DappAccountMoneyChangeEntity(member.getId(), preAmount, walletOperateDto.getAmount(), walletCoin.getAvailableAmount(), "USDT申请提现", AppContants.MONEY_TYPE_WITHDRAWAL);
@@ -123,8 +134,10 @@
public List<DappFundFlowEntity> recordInPage(RecordInPageDto recordInPageDto) {
Page<DappFundFlowEntity> page = new Page<>(recordInPageDto.getPageNum(), recordInPageDto.getPageSize());
+ DappMemberEntity member = LoginUserUtil.getAppUser();
DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity();
dappFundFlowEntity.setType(recordInPageDto.getType());
+ dappFundFlowEntity.setMemberId(member.getId());
IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
return records.getRecords();
}
@@ -183,4 +196,36 @@
Page<DappAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
return dappAccountMoneyChangeDao.selectInPage(change, page);
}
+
+ @Override
+ public void transfer(TransferDto transferDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+
+// ChainService.getInstance(ChainEnum.BSC_USDT_SOURCE.name()).balanceOf(member.getAddress());
+// ChainService.getInstance(ChainEnum.BSC_TFC_SOURCE.name()).balanceOf(member.getAddress());
+
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash());
+ fundFlow.setNewestPrice(transferDto.getPrice());
+ dappFundFlowDao.insert(fundFlow);
+ }
+
+ @Override
+ public Map<String, BigDecimal> calPrice() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+
+ ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
+ // u剩余数量
+ BigDecimal sourceU = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+ // 源池代币剩余数量
+ BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+ // 用户代币剩余数量
+ BigDecimal coin = tfcInstance.balanceOf(member.getAddress());
+ BigDecimal x = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_DOWN);
+ BigDecimal y = sourceU.divide(sourceCoin.add(coin), tfcInstance.decimals(), RoundingMode.HALF_DOWN);
+
+ HashMap<String, BigDecimal> map = new HashMap<>();
+ map.put("x", BigDecimal.ONE);
+ map.put("y", BigDecimal.valueOf(0.8D));
+ return map;
+ }
}
--
Gitblit v1.9.1