From 6c29204c6a4afed0eb476c92bb4f464c88cde3a9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 18:43:38 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 b541147..802720c 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,14 +3,17 @@
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.*;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
@@ -22,7 +25,7 @@
import java.util.List;
/**
- * @author wzy
+ * @author
* @date 2022-03-18
**/
@Slf4j
@@ -39,15 +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.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;
}
@@ -93,6 +99,11 @@
public void withdraw(WalletOperateDto walletOperateDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
+ List<DappFundFlowEntity> fundFlows = dappFundFlowDao.selectListForMemberAndDay(member.getId(), 2);
+ if (CollUtil.isNotEmpty(fundFlows)) {
+ throw new FebsException("一天只能提现一次");
+ }
+
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
if (walletOperateDto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) {
throw new FebsException("可用金额不足");
@@ -117,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();
}
@@ -177,4 +190,9 @@
Page<DappAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
return dappAccountMoneyChangeDao.selectInPage(change, page);
}
+
+ @Override
+ public void transfer(TransferDto transferDto) {
+
+ }
}
--
Gitblit v1.9.1