From 625549a8db022f4389da03be38967996218bfdc9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 21 Jul 2024 23:16:16 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 fcf98e1..fadf9f2 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
@@ -96,9 +96,9 @@
BigDecimal runPerk = dappFundFlowDao.selectSumRunPerkByMemberId(member.getId());
walletInfo.setRunPerk(runPerk);
- List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectList(null);
-// List<DappStorage> allAddressNums = dappStorageMapper.selectListGroupByMemberId();
- walletInfo.setAddressNum(CollUtil.isEmpty(dappMemberEntities) ? 0 : dappMemberEntities.size());
+// List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectList(null);
+ List<DappStorage> allAddressNums = dappStorageMapper.selectListGroupByMemberId();
+ walletInfo.setAddressNum(CollUtil.isEmpty(allAddressNums) ? 0 : allAddressNums.size());
DappStorage dappStorage = dappStorageMapper.selectOneByCreateTimeDesc(0, 1);
walletInfo.setBuChangDate(ObjectUtil.isEmpty(dappStorage) ?
@@ -254,6 +254,10 @@
}
if(withdrawDto.getAmount().compareTo(usdtBalance) > 0){
throw new FebsException("额度不足");
+ }
+ DappStorage dappStorage = dappStorageMapper.selectAmountByAmountDesc(member.getId(),0, 1);
+ if(ObjectUtil.isEmpty(dappStorage)){
+ throw new FebsException("请存储");
}
}else{
if(BigDecimal.ZERO.compareTo(withdrawDto.getAmount()) >= 0){
@@ -820,12 +824,15 @@
startTimeStr = DateUtil.formatDate(DateUtil.offsetDay(new Date(), -1)) + " 17:00:00";
}
DateTime startTime = DateUtil.parseDateTime(startTimeStr);
- List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDateFiveToFiver(startTime);
+// List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDateFiveToFiver(startTime);
+
+ List<DappStorage> dappStorages = dappStorageMapper.selectListByDateFiveToFiver(startTime);
+ Set<Long> collect = dappStorages.stream().map(DappStorage::getMemberId).collect(Collectors.toSet());
// List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDate(new Date());
- if(CollUtil.isNotEmpty(dappMemberEntityList)){
- for(DappMemberEntity member : dappMemberEntityList){
-
+ if(CollUtil.isNotEmpty(collect)){
+ for(Long memberId : collect){
+ DappMemberEntity member = dappMemberDao.selectById(memberId);
if(StrUtil.isEmpty(member.getRefererId())){
continue;
}
--
Gitblit v1.9.1