From 65b836bcb362b0642ef8ab0d2da284e079325878 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 11 Jun 2022 23:10:27 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 123 ++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 21 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 92ae21b..0dcae82 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
@@ -31,7 +31,7 @@
import java.util.Map;
/**
- * @author
+ * @author
* @date 2022-03-18
**/
@Slf4j
@@ -48,18 +48,20 @@
@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;
}
@@ -136,7 +138,9 @@
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());
IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
return records.getRecords();
@@ -198,20 +202,96 @@
}
@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 (member.getActiveStatus() == 2) {
+ throw new FebsException("请联系邀请人转币激活");
+ }
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash());
- fundFlow.setNewestPrice(transferDto.getPrice());
- dappFundFlowDao.insert(fundFlow);
+ // 每日出U剩余量(卖币)
+ BigDecimal usdtRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN);
+ // 用户24小时可出售量
+ BigDecimal saleCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress());
+ BigDecimal buyCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
+ // 铸池中的币的剩余量
+ BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
+
+ if (transferDto.getId() == null) {
+ String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
+ if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
+ if (!"start".equals(hasStart)) {
+ throw new FebsException("系统还未启动");
+ }
+
+ if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) {
+ throw new FebsException("超过当日出U剩余量");
+ }
+
+ if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) {
+ throw new FebsException("超出24小时内可售量");
+ }
+
+ } else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
+ if ("start".equals(hasStart)) {
+ if (transferDto.getAmount().compareTo(buyCoinRemain) > 0) {
+ throw new FebsException("超过当日可购买量");
+ }
+ // 如果系统还没有启动，则判断铸池中的剩余量
+ } else {
+ if (transferDto.getAmount().compareTo(makeCoinRemain) > 0) {
+ throw new FebsException("可购数量不足");
+ }
+ }
+ }
+
+ 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();
+ }
+
+ if ("success".equals(transferDto.getFlag())) {
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+
+ flow.setFromHash(transferDto.getTxHash());
+ dappFundFlowDao.updateById(flow);
+
+ if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
+ usdtRemain = usdtRemain.subtract(flow.getAmount().multiply(flow.getNewestPrice()));
+ saleCoinRemain = saleCoinRemain.subtract(flow.getAmount());
+
+ // 修改当日U剩余量
+ redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
+ // 修改用户24小时可售量
+ redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
+ } else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
+ buyCoinRemain = buyCoinRemain.subtract(flow.getAmount());
+
+ // 修改当日可购买量
+ redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
+ } else {
+
+ throw new FebsException("参数错误");
+ }
+ } else {
+ dappFundFlowDao.deleteById(transferDto.getId());
+ }
+ return null;
}
@Override
public Map<String, BigDecimal> calPrice() {
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剩余数量
@@ -220,12 +300,13 @@
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);
+ 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