From 19a4e58671e39afaf0e89e9fd5b13f0c3851c595 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 13 Jul 2022 10:42:23 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 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 7a17fcb..1a586ee 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;
@@ -8,6 +9,8 @@
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.PriceDto;
import cc.mrbird.febs.dapp.dto.RecordInPageDto;
import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.dto.WalletOperateDto;
@@ -24,12 +27,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
+ * @author
* @date 2022-03-18
**/
@Slf4j
@@ -43,21 +47,24 @@
private final DappFundFlowDao dappFundFlowDao;
private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
private final RedisUtils redisUtils;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
public WalletInfoVo walletInfo() {
-// DappMemberEntity member = LoginUserUtil.getAppUser();
-// DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
-// DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Map<String, BigDecimal> map = dappFundFlowDao.selectAmountTotalByType(member.getId());
WalletInfoVo walletInfo = new WalletInfoVo();
-// walletInfo.setInviteId(member.getInviteId());
-// walletInfo.setTotalMine(walletMine.getTotalAmount());
-// walletInfo.setAvailableMine(walletMine.getAvailableAmount());
-// walletInfo.setAvailableWallet(walletCoin.getAvailableAmount());
+ List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1);
+ List<DappMemberEntity> notDirect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2);
+ BigDecimal childHoldAmount = dappMemberDao.selectChildHoldAmount(member.getInviteId());
- walletInfo.setTotalChild(10000);
- walletInfo.setTotalChild(41451);
+ walletInfo.setTotalChild(notDirect.size());
+ walletInfo.setDirectCnt(direct.size());
+ walletInfo.setTotalChildCoin(childHoldAmount);
+ walletInfo.setTeamReward(map.get("teamReward"));
+ walletInfo.setMiningAmount(map.get("mine"));
+ walletInfo.setInviteId(member.getInviteId());
return walletInfo;
}
@@ -134,8 +141,12 @@
DappMemberEntity member = LoginUserUtil.getAppUser();
DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity();
- dappFundFlowEntity.setType(recordInPageDto.getType());
+ if (recordInPageDto.getType() != null && recordInPageDto.getType() != 0) {
+ dappFundFlowEntity.setType(recordInPageDto.getType());
+ }
dappFundFlowEntity.setMemberId(member.getId());
+ dappFundFlowEntity.setStatus(2);
+
IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
return records.getRecords();
}
@@ -196,21 +207,57 @@
}
@Override
- public void transfer(TransferDto transferDto) {
+ public Long 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());
+ if (transferDto.getId() == null) {
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash());
+ fundFlow.setNewestPrice(transferDto.getPrice());
+ dappFundFlowDao.insert(fundFlow);
+ return fundFlow.getId();
+ }
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash());
- dappFundFlowDao.insert(fundFlow);
+ if ("success".equals(transferDto.getFlag())) {
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+
+ flow.setFromHash(transferDto.getTxHash());
+ dappFundFlowDao.updateById(flow);
+ } else {
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+ if (flow.getStatus() == 1) {
+ dappFundFlowDao.deleteById(transferDto.getId());
+ }
+ }
+ return null;
}
@Override
- public Map<String, BigDecimal> calPrice() {
+ public Map<String, BigDecimal> calPrice(PriceDto priceDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+
+
+ String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
+ if (!"start".equals(hasStart)) {
+ HashMap<String, BigDecimal> map = new HashMap<>();
+ map.put("x", new BigDecimal("0.075"));
+ map.put("y", new BigDecimal("100000"));
+ return map;
+ }
+
+ 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 = priceDto.getAmount();
+ BigDecimal x = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_UP);
+ BigDecimal y = sourceU.divide(sourceCoin.add(coin), tfcInstance.decimals(), RoundingMode.HALF_UP);
+
+ log.info("购买价格:{}, 出卖价格:{}", x, y);
HashMap<String, BigDecimal> map = new HashMap<>();
- map.put("x", BigDecimal.ONE);
- map.put("y", BigDecimal.valueOf(0.8D));
+ map.put("x", x);
+ map.put("y", y);
return map;
}
}
--
Gitblit v1.9.1