From 650d73c83bf3fefb2c90284639d6b5e706637bcd Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 21 Jul 2024 15:40:57 +0800
Subject: [PATCH] 逻辑

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 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 ff5b68a..3283187 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,7 +96,7 @@
         BigDecimal runPerk = dappFundFlowDao.selectSumRunPerkByMemberId(member.getId());
         walletInfo.setRunPerk(runPerk);
 
-
+//        List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectList(null);
         List<DappStorage> allAddressNums = dappStorageMapper.selectListGroupByMemberId();
         walletInfo.setAddressNum(CollUtil.isEmpty(allAddressNums) ? 0 : allAddressNums.size());
 
@@ -244,17 +244,22 @@
 
         DappMemberEntity memberEntity = dappMemberDao.selectById(member.getId());
         BigDecimal usdtBalance = memberEntity.getUsdtBalance();
-        if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
-            throw new FebsException("额度不足");
-        }
+        if(1 != memberEntity.getNodeType()){
+            if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
+                throw new FebsException("额度不足");
+            }
 
-        if(BigDecimal.ZERO.compareTo(withdrawDto.getAmount()) >= 0){
-            throw new FebsException("请输入正确的数量");
+            if(BigDecimal.ZERO.compareTo(withdrawDto.getAmount()) >= 0){
+                throw new FebsException("请输入正确的数量");
+            }
+            if(withdrawDto.getAmount().compareTo(usdtBalance) > 0){
+                throw new FebsException("额度不足");
+            }
+        }else{
+            if(BigDecimal.ZERO.compareTo(withdrawDto.getAmount()) >= 0){
+                throw new FebsException("请输入正确的数量");
+            }
         }
-        if(withdrawDto.getAmount().compareTo(usdtBalance) > 0){
-            throw new FebsException("额度不足");
-        }
-
 //        List<MemberCoinWithdrawEntity> memberCoinWithdrawEntities = memberCoinWithdrawDao.selectListByDate(member.getId(),new Date());
 //        if(CollUtil.isNotEmpty(memberCoinWithdrawEntities)){
 //            throw new FebsException("今日已提现");
@@ -273,9 +278,10 @@
         BigDecimal feeAmount = withdrawDto.getAmount().multiply(withdrawPercent).setScale(2, BigDecimal.ROUND_DOWN);
 
         updateWalletCoinWithLock(withdrawDto.getAmount(), member.getId(), 2);
-
-        memberEntity.setUsdtBalance(usdtBalance.subtract(withdrawDto.getAmount()).setScale(2,BigDecimal.ROUND_DOWN));
-        dappMemberDao.updateById(memberEntity);
+        if(1 != memberEntity.getNodeType()){
+            memberEntity.setUsdtBalance(usdtBalance.subtract(withdrawDto.getAmount()).setScale(2,BigDecimal.ROUND_DOWN));
+            dappMemberDao.updateById(memberEntity);
+        }
 
         DappFundFlowEntity fundFlow = new DappFundFlowEntity(
                 member.getId(),
@@ -814,12 +820,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