From ad959c3690aea52a0e54e92b001d1959c26c4cc4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 145 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 113 insertions(+), 32 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 eae081e..62cc0f6 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
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.utils.SpringContextUtil;
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
+import cc.mrbird.febs.dapp.contract.ContractMain;
import cc.mrbird.febs.dapp.dto.SystemDto;
import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.entity.*;
@@ -28,8 +29,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.web3j.utils.Convert;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.math.RoundingMode;
import java.util.*;
@@ -53,6 +56,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final DappSystemProfitDao dappSystemProfitDao;
private final ChainProducer chainProducer;
+ private final ContractMain contractMain;
@Override
@@ -340,7 +344,7 @@
QueryWrapper<DappMemberEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("referer_id",refererMember.getInviteId());
Integer selectCount = dappMemberDao.selectCount(objectQueryWrapper);
- if(i > selectCount){
+ if(i >= selectCount){
continue;
}
//获取对应层级奖励
@@ -361,8 +365,8 @@
}
//如果还有剩余给技术方
if(levelProfitTotal.compareTo(systemProfitTotal) > 0){
- BigDecimal avaProfit = levelProfitTotal.subtract(systemProfit);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(memberId, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
+ BigDecimal avaProfit = levelProfitTotal.subtract(systemProfitTotal);
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(2L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlow.getId());
@@ -383,7 +387,7 @@
String memberOutCount = redisUtils.getString(redisKey);
DataDictionaryCustom queueCountSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.QUEUE_COUNT.getType(), DataDictionaryEnum.QUEUE_COUNT.getCode());
String queueCount = queueCountSet.getValue();
- if(StrUtil.isBlank(memberOutCount)){
+ if(StrUtil.isBlank(memberOutCount) || !queueCount.equals(memberOutCount)){
redisUtils.set(redisKey,queueCount,0L);
memberOutCount = queueCount;
}
@@ -419,8 +423,11 @@
DappSystemProfit dappSystemProfitNow = dappSystemProfitDao.selectByIdForUpdate(dappSystemProfit.getId(),DappSystemProfit.STATE_IN);
dappSystemProfitDao.updateStateById(DappSystemProfit.STATE_OUT,dappSystemProfitNow.getId());
- //todo 直接拿走0.95ge
- DappFundFlowEntity fundFlowOut = new DappFundFlowEntity(dappSystemProfitNow.getMemberId(), new BigDecimal(0.95), 7, 1, BigDecimal.ZERO, null,dappSystemProfitNow.getId());
+ // 直接拿走0.95ge
+
+ DataDictionaryCustom investAmountProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.INVEST_AMOUNT_PROFIT.getType(), DataDictionaryEnum.INVEST_AMOUNT_PROFIT.getCode());
+ BigDecimal investAmountProfit = new BigDecimal(investAmountProfitSet.getValue());
+ DappFundFlowEntity fundFlowOut = new DappFundFlowEntity(dappSystemProfitNow.getMemberId(), investAmountProfit, 7, 1, BigDecimal.ZERO, null,dappSystemProfitNow.getId());
dappFundFlowDao.insert(fundFlowOut);
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlowOut.getId());
@@ -447,59 +454,133 @@
public void bnbTransfer(Long id) {
log.info("{}",id);
//获取对应的流水记录
- DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+ DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectInfoById(id);
if(ObjectUtil.isEmpty(dappFundFlowEntity)){
return;
}
if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == dappFundFlowEntity.getStatus()){
return;
}
-// //金额
-// BigDecimal amount = dappFundFlowEntity.getAmount();
-// Long memberId = dappFundFlowEntity.getMemberId();
-// DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
-// if(ObjectUtil.isEmpty(dappMemberEntity)){
-// return;
-// }
-// //目标地址
-// String address = dappMemberEntity.getAddress();
-// String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
-// if(StrUtil.isEmpty(hash)){
-// return;
-// }
-// dappFundFlowEntity.setToHash(hash);
- dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
- dappFundFlowDao.updateById(dappFundFlowEntity);
-
- }
-
- @Override
- public void agentUp(String inviteId) {
- //根据邀请码获取用户信息
- DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(inviteId);
+ Long memberId = dappFundFlowEntity.getMemberId();
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
if(ObjectUtil.isEmpty(dappMemberEntity)){
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);
+// }
+ }
+
+ @Override
+ public void agentUp(Long id) {
+ //根据邀请码获取用户信息
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
+ 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;
}
//当前为BOSS，且直推中有两个BOSS以上，则升级BIG_BOSS
if(DataDictionaryEnum.BOSS.getCode().equals(accountType)){
- Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(DataDictionaryEnum.BOSS.getCode(),inviteId);
+ Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(DataDictionaryEnum.BOSS.getCode(),dappMemberEntity.getInviteId());
if(2 <= bossCount){
dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BIG_BOSS.getCode(),dappMemberEntity.getId());
}
+ return;
}
//当前为AGENT，且直推中有两个以上，则升级BOSS
if(DataDictionaryEnum.AGENT.getCode().equals(accountType)){
- Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(null,inviteId);
+ Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(null,dappMemberEntity.getInviteId());
if(2 <= bossCount){
dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BOSS.getCode(),dappMemberEntity.getId());
}
+ return;
}
}
+ @Override
+ public void bnbTransferTest(Long id) {
+ DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+ if(ObjectUtil.isEmpty(dappFundFlow)){
+ return;
+ }
+ if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlow.getIsReturn()){
+ return;
+ }
+ //用户已经加入动能队列
+ DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
+ if(ObjectUtil.isEmpty(dappSystemProfit)){
+ return;
+ }
+ //金额
+ BigDecimal amount = dappFundFlow.getAmount();
+ //目标地址
+ Long memberId = dappFundFlow.getMemberId();
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ return;
+ }
+ String address = dappMemberEntity.getAddress();
+ log.info("{}",address);
+// BigInteger bigInteger = new BigInteger(Convert.toWei("0.000001", Convert.Unit.ETHER).setScale(0).toString());
+ BigInteger bigInteger = new BigInteger(Convert.toWei(amount.toString(), Convert.Unit.ETHER).setScale(0).toString());
+ log.info("{}",bigInteger);
+ String hash = contractMain.trans(bigInteger,address);
+ if(StrUtil.isEmpty(hash)){
+ return;
+ }
+
+ dappFundFlow.setFromHash(hash);
+ dappFundFlowDao.updateById(dappFundFlow);
+ }
+
public static void main(String[] args) {
String refererIds = "1,2,3,4,5," +
"6,7,8,9,10," +
--
Gitblit v1.9.1