From 8e955d19eb45cb1c4a43a0055ee05c50005318fd Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 25 Jul 2024 09:47:31 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 43e3584..d04fc98 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
@@ -255,6 +255,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){
throw new FebsException("请输入正确的数量");
@@ -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;
}
@@ -862,10 +869,24 @@
ApiDirectInfoVo apiDirectInfoVo = new ApiDirectInfoVo();
apiDirectInfoVo.setAddress(dappMemberDao.selectById(memberId).getAddress());
apiDirectInfoVo.setAmount(directCnt);
-
+ DappStorage dappStorage = dappStorageMapper.selectNewRecordByRefMemberId(memberId);
+ apiDirectInfoVo.setCreateTime(dappStorage.getCreateTime());
apiDirectInfoVos.add(apiDirectInfoVo);
}
}
+ if(CollUtil.isNotEmpty(apiDirectInfoVos)){
+ apiDirectInfoVos = apiDirectInfoVos.stream()
+ .sorted((a, b) -> {
+ // 先按照amount从大到小排序
+ int compare = b.getAmount().compareTo(a.getAmount());
+ if (compare != 0) {
+ return compare;
+ }
+ // 如果amount相同，则按照createTime从小到大排序
+ return a.getCreateTime().compareTo(b.getCreateTime());
+ })
+ .collect(Collectors.toList());
+ }
return apiDirectInfoVos;
--
Gitblit v1.9.1