From e18ff5fadcd429d991653f330d9dcf5f33010405 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 17:06:19 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 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 65ec96e..bcbae19 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
@@ -463,21 +463,21 @@
return;
}
Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,dappFundFlowEntity.getId());
- if(count > 0){
- DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
- //金额
- BigDecimal amount = dappFundFlow.getAmount();
- //目标地址
- String address = dappFundFlow.getAddress();
- // String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
- String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
- if(StrUtil.isEmpty(hash)){
- return;
- }
- log.info("{},{}",id,hash);
- dappFundFlow.setFromHash(hash);
- dappFundFlowDao.updateById(dappFundFlow);
- }
+// if(count > 0){
+// DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+// //金额
+// BigDecimal amount = dappFundFlow.getAmount();
+// //目标地址
+// String address = dappFundFlow.getAddress();
+// // String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
+// String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+// if(StrUtil.isEmpty(hash)){
+// return;
+// }
+// log.info("{},{}",id,hash);
+// dappFundFlow.setFromHash(hash);
+// dappFundFlowDao.updateById(dappFundFlow);
+// }
}
@Override
@@ -487,6 +487,38 @@
if(ObjectUtil.isEmpty(dappMemberEntity)){
return;
}
+ //所有上级（不包含直属上级）
+ String refererIds = dappMemberEntity.getRefererIds();
+ List<String> refererIdList = StrUtil.split(refererIds, ',');
+ if(CollUtil.isNotEmpty(refererIdList)){
+ for(String inviteIdStr : refererIdList){
+ DappMemberEntity dappMemberEntityUp = dappMemberDao.selectMemberInfoByInviteId(inviteIdStr);
+ if(ObjectUtil.isEmpty(dappMemberEntityUp)){
+ continue;
+ }
+ String accountType = dappMemberEntityUp.getAccountType();
+ if(DataDictionaryEnum.BIG_BOSS.getCode().equals(accountType)){
+ continue;
+ }
+ //当前为BOSS，且直推中有两个BOSS以上，则升级BIG_BOSS
+ if(DataDictionaryEnum.BOSS.getCode().equals(accountType)){
+ Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(DataDictionaryEnum.BOSS.getCode(),dappMemberEntityUp.getInviteId());
+ if(2 <= bossCount){
+ dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BIG_BOSS.getCode(),dappMemberEntityUp.getId());
+ }
+ continue;
+ }
+ //当前为AGENT，且直推中有两个以上，则升级BOSS
+ if(DataDictionaryEnum.AGENT.getCode().equals(accountType)){
+ Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(null,dappMemberEntityUp.getInviteId());
+ if(2 <= bossCount){
+ dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BOSS.getCode(),dappMemberEntityUp.getId());
+ }
+ continue;
+ }
+ }
+ }
+ //直属上级
String accountType = dappMemberEntity.getAccountType();
if(DataDictionaryEnum.BIG_BOSS.getCode().equals(accountType)){
return;
@@ -512,6 +544,11 @@
@Override
public void bnbTransferTest(Long id) {
DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+ //用户已经加入动能队列
+ DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
+ if(ObjectUtil.isEmpty(dappSystemProfit)){
+ return;
+ }
if(ObjectUtil.isEmpty(dappFundFlow)){
return;
}
--
Gitblit v1.9.1