From 79b15889217d9f6d2ef86ccba0c3ace5055a4b66 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 30 May 2022 11:12:17 +0800 Subject: [PATCH] add transfer --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 32 +++++++++++++++++++++++--------- 1 files changed, 23 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 daa330b..9483f16 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,11 @@ 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.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.*; @@ -40,16 +42,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.setInviteId(member.getInviteId()); - 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; } @@ -113,7 +117,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); @@ -124,8 +128,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(); } @@ -184,4 +190,12 @@ Page<DappAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); return dappAccountMoneyChangeDao.selectInPage(change, page); } + + @Override + public void transfer(TransferDto transferDto) { + DappMemberEntity member = LoginUserUtil.getAppUser(); + + DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash()); + dappFundFlowDao.insert(fundFlow); + } } -- Gitblit v1.9.1