From 2e690bad9f008ba49779599fda1b47cf058a3d2d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 04 Sep 2022 18:19:03 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 14 +-------------
src/test/java/cc/mrbird/febs/TreeTest.java | 2 +-
2 files changed, 2 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..bc83493 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"));
diff --git a/src/test/java/cc/mrbird/febs/TreeTest.java b/src/test/java/cc/mrbird/febs/TreeTest.java
index 12a0ec3..9bdeab9 100644
--- a/src/test/java/cc/mrbird/febs/TreeTest.java
+++ b/src/test/java/cc/mrbird/febs/TreeTest.java
@@ -51,6 +51,6 @@
@Test
public void limitResetProfitTest() {
- dappSystemService.putIntoProfit(60L, 1);
+ dappSystemService.putIntoProfit(59L, 1);
}
}
--
Gitblit v1.9.1