From aa8ea668737a3761ba91167eab8e7a28f1e4afae Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 10 Sep 2022 20:16:07 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index f520e99..d5c7446 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -176,18 +176,6 @@
         if (isReIn == 1) {
             List<DappMemberEntity> directCnt = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
 
-            boolean hasNewDirect = false;
-            if (directCnt.size() < 3) {
-                DappMemberEntity newestDirect = dappMemberDao.selectNewestDirectMember(member.getInviteId());
-                DappFundFlowEntity fundFlow = dappFundFlowDao.selectNewestFundFlow(memberId, 9);
-
-                if (newestDirect != null && fundFlow != null) {
-                    if (newestDirect.getCreateTime().after(fundFlow.getCreateTime())) {
-                        hasNewDirect = true;
-                    }
-                }
-            }
-
             /**
              * 复投后,推一个拿一轮,推两个拿两轮,推三个后终身有效。
              * 按规则每轮未能提取的奖金分配:
@@ -195,7 +183,7 @@
              * 20%给到推荐人
              * 30%留下待提。
              */
-            if (directCnt.size() < 3 && member.getOutCnt() != 0 && member.getOutCnt() - 1 == directCnt.size() && !hasNewDirect) {
+            if (directCnt.size() < 3 && member.getOutCnt() != 0 && member.getOutCnt() - 1 == directCnt.size()) {
                 BigDecimal amount = new BigDecimal("190");
 
                 BigDecimal sourcePool = amount.multiply(new BigDecimal("0.5"));
@@ -203,7 +191,9 @@
 
                 BigDecimal remain = amount.subtract(sourcePool).subtract(directAmount);
 
-//                ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer("", sourcePool);
+                new Thread(() -> {
+                    ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer("0xb06cc3dAF362a1670F12eBD0242022b538Ca72ef", sourcePool);
+                }).start();
 
                 if (parent != null) {
                     dappWalletService.updateWalletCoinWithLock(directAmount, parent.getId(), 1);

--
Gitblit v1.9.1