From ef76b5409cd10494bb1bb686b00c297f3ed023bc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 09 Jul 2024 17:42:28 +0800
Subject: [PATCH] 逻辑

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 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 4c7f388..d5fe847 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
@@ -18,6 +18,7 @@
 import cc.mrbird.febs.dapp.vo.*;
 import cc.mrbird.febs.rabbit.producer.ChainProducer;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -245,14 +246,18 @@
         if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
             throw new FebsException("额度不足");
         }
+
+        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("今日已提现");
-        }
+//        List<MemberCoinWithdrawEntity> memberCoinWithdrawEntities = memberCoinWithdrawDao.selectListByDate(member.getId(),new Date());
+//        if(CollUtil.isNotEmpty(memberCoinWithdrawEntities)){
+//            throw new FebsException("今日已提现");
+//        }
 
         DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
         if (walletCoin.getAvailableAmount().compareTo(withdrawDto.getAmount()) < 0) {
@@ -415,6 +420,11 @@
                 DataDictionaryEnum.START_SYMBOL.getCode()
         );
         if("STOP".equals(startSymbolDic.getValue())){
+            throw new FebsException("贡献暂未开启");
+        }
+
+        DateTime startTime = DateUtil.parseDateTime("2024-07-09 17:00:00");
+        if(DateUtil.compare(DateUtil.date(), startTime) < 0){
             throw new FebsException("贡献暂未开启");
         }
 
@@ -780,9 +790,13 @@
         List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDate(new Date());
         if(CollUtil.isNotEmpty(dappMemberEntityList)){
             for(DappMemberEntity member : dappMemberEntityList){
+
                 if(StrUtil.isEmpty(member.getRefererId())){
                     continue;
                 }
+                if(2 == member.getActiveStatus()){
+                    continue;
+                }
                 DappMemberEntity memberRef = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
                 if(ObjectUtil.isEmpty(memberRef)){
                     continue;

--
Gitblit v1.9.1