From 420efcecbc5b9b17f96b9c0a37d9bc3a5f1afccd Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 06 Nov 2022 17:46:01 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 61 ++++++++----------------------
1 files changed, 17 insertions(+), 44 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..3d6bb3b 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
@@ -14,6 +14,7 @@
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cc.mrbird.febs.tree.MatrixTree;
import cc.mrbird.febs.tree.MemberNode;
+import cc.mrbird.febs.tree.TreeConstants;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -176,70 +177,42 @@
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;
- }
- }
- }
-
/**
* 复投后，推一个拿一轮，推两个拿两轮，推三个后终身有效。
- * 按规则每轮未能提取的奖金分配：
- * 50%直接进入TFC底池
- * 20%给到推荐人
- * 30%留下待提。
+ * 200u单。
+ * 无直推则收益200U
+ * 一人加一轮400u，二人二轮
+ * 三人永久。
*/
- if (directCnt.size() < 3 && member.getOutCnt() != 0 && member.getOutCnt() - 1 == directCnt.size() && !hasNewDirect) {
- BigDecimal amount = new BigDecimal("190");
-
- BigDecimal sourcePool = amount.multiply(new BigDecimal("0.5"));
- BigDecimal directAmount = amount.multiply(new BigDecimal("0.2"));
-
- BigDecimal remain = amount.subtract(sourcePool).subtract(directAmount);
-
-// ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer("", sourcePool);
-
- if (parent != null) {
- dappWalletService.updateWalletCoinWithLock(directAmount, parent.getId(), 1);
-
- DappFundFlowEntity direct = new DappFundFlowEntity(parent.getId(), directAmount, 3, 2, null, null);
- dappFundFlowDao.insert(direct);
+ if (directCnt.size() < 3 && member.getOutCnt() != 0 && member.getOutCnt() - 1 == directCnt.size()) {
+ return;
+ } else {
+ BigDecimal amount = null;
+ if (directCnt.size() < 1) {
+ amount = TreeConstants.PUT_IN_AMOUNT;
+ } else {
+ amount = TreeConstants.FULL_PROFIT_AMOUNT;
}
- dappWalletService.addFrozenAmountWithLock(remain, memberId);
- } else {
dappWalletService.releaseFrozenAmountWithLock(memberId);
member.setOutCnt(member.getOutCnt() + 1);
dappMemberDao.updateById(member);
- dappWalletService.updateWalletCoinWithLock(new BigDecimal(190), member.getId(), 1);
+ dappWalletService.updateWalletCoinWithLock(amount, member.getId(), 1);
- DappFundFlowEntity matrixProfitFlow = new DappFundFlowEntity(memberId, new BigDecimal("190"), 2, 2, null, null);
+ DappFundFlowEntity matrixProfitFlow = new DappFundFlowEntity(memberId, amount, 2, 2, null, null);
dappFundFlowDao.insert(matrixProfitFlow);
}
- DappFundFlowEntity rePutInFlow = new DappFundFlowEntity(memberId, new BigDecimal("100").negate(), 1, 2, null, null);
+ DappFundFlowEntity rePutInFlow = new DappFundFlowEntity(memberId, TreeConstants.PUT_IN_AMOUNT.negate(), 1, 2, null, null);
dappFundFlowDao.insert(rePutInFlow);
-
- DappFundFlowEntity safePoolFlow = new DappFundFlowEntity(memberId, new BigDecimal("10").negate(), 4, 2, null, null);
- dappFundFlowDao.insert(safePoolFlow);
-
- DappMineDataEntity mineData = dappSystemDao.selectMineDataForOne();
- mineData.setSafePool(mineData.getSafePool().add(BigDecimal.TEN));
- dappSystemDao.updateMineData(mineData);
}
}
@Override
public void tfcNewPrice(String data) {
- redisUtils.set(AppContants.REDIS_KEY_TFC_NEW_PRICE, new BigDecimal(data));
+// redisUtils.set(AppContants.REDIS_KEY_TFC_NEW_PRICE, new BigDecimal(data));
}
@Override
--
Gitblit v1.9.1