From 73cfce48624bc8558d387ee8b3204cad8d4bbedd Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 13 Jun 2022 18:19:54 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 17 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 03eb81a..829727f 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 @@ -9,6 +9,7 @@ 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; @@ -48,18 +49,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 +139,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(); @@ -213,8 +218,8 @@ // 铸池中的币的剩余量 BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT); + String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG); 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("系统还未启动"); @@ -262,12 +267,18 @@ // 修改用户24小时可售量 redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain); } else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) { - buyCoinRemain = buyCoinRemain.subtract(flow.getAmount()); + if ("start".equals(hasStart)) { + buyCoinRemain = buyCoinRemain.subtract(flow.getAmount()); - // 修改当日可购买量 - redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain); + // 修改当日可购买量 + redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain); + } else { + makeCoinRemain = makeCoinRemain.subtract(flow.getAmount()); + + // 修改铸池量 + redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain); + } } else { - throw new FebsException("参数错误"); } } else { @@ -277,8 +288,17 @@ } @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剩余数量 @@ -286,7 +306,7 @@ // 源池代币剩余数量 BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress()); // 用户代币剩余数量 - BigDecimal coin = tfcInstance.balanceOf(member.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); -- Gitblit v1.9.1