From 9c28be9e20bff3dfed0b122520a9b659cc37f36e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 11:09:57 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 92 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 72 insertions(+), 20 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 d33ade5..0dcfa95 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
@@ -295,6 +295,11 @@
if(ObjectUtil.isEmpty(dappSystemProfit)){
return;
}
+ Integer levelProfitState = dappSystemProfit.getLevelProfit();
+
+ if(DappSystemProfit.ENUM_YES == levelProfitState){
+ return;
+ }
Long memberId = dappSystemProfit.getMemberId();
//获取用户的上级用户信息
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
@@ -318,7 +323,15 @@
//返回十层
List<String> refererIdList = StrUtil.split(refererIds, ',');
//i：计数层数，同时i也为对应层数应推广的人数，当达到对应的直推人数时，才能获取对应层级奖励
- for(int i = 0;i < 10; i++){
+ if(CollUtil.isEmpty(refererIdList)){
+ return;
+ }
+ //层级奖励最大循环次数
+ int maxLevel = 10;
+ if(maxLevel > refererIdList.size()){
+ maxLevel = refererIdList.size();
+ }
+ for(int i = 0;i < maxLevel; i++){
if(systemProfitTotal.compareTo(levelProfitTotal) < 0){
String inviteId = refererIdList.get(i);
//获取每层用户的直推人数，判断能否获得这个层级的层级奖励
@@ -327,11 +340,11 @@
QueryWrapper<DappMemberEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("referer_id",refererMember.getInviteId());
Integer selectCount = dappMemberDao.selectCount(objectQueryWrapper);
- if(i > selectCount){
+ if(i >= selectCount){
continue;
}
//获取对应层级奖励
- BigDecimal profit = LevelProfitEnum.YI.getProfit(i);
+ BigDecimal profit = LevelProfitEnum.YI.getProfit(i+1);
String accountType = refererMember.getAccountType();
//根据会员的等级类型，获取对应的百分比收益
DataDictionaryCustom memberLevelSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("MEMBER_LEVEL", accountType);
@@ -348,12 +361,14 @@
}
//如果还有剩余给技术方
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(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlow.getId());
}
+
+ dappSystemProfitDao.updateLevelProfitById(DappSystemProfit.ENUM_YES,dappSystemProfit.getId());
}
@Override
@@ -368,7 +383,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;
}
@@ -402,11 +417,13 @@
redisUtils.set(redisKey,realCount,0L);
DappSystemProfit dappSystemProfitNow = dappSystemProfitDao.selectByIdForUpdate(dappSystemProfit.getId(),DappSystemProfit.STATE_IN);
- dappSystemProfitNow.setState(DappSystemProfit.STATE_OUT);
- dappSystemProfitDao.updateById(dappSystemProfitNow);
+ 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());
+
+ 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());
@@ -424,34 +441,69 @@
transferDto.setBuyType(2);
transferDto.setId(fundFlow.getId());
transferDto.setFlag("success");
+ transferDto.setAmount(investAmount);
transferDto.setMemberId(dappSystemProfitNow.getMemberId());
dappWalletService.transferAgain(transferDto);
}
@Override
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)){
+ Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,dappFundFlowEntity.getId());
+// if(count > 0){
+// //金额
+// BigDecimal amount = dappFundFlowEntity.getAmount();
+// //目标地址
+// String address = dappMemberEntity.getAddress();
+// String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
+// if(StrUtil.isEmpty(hash)){
+// return;
+// }
+// dappFundFlowEntity.setToHash(hash);
+// dappFundFlowDao.updateById(dappFundFlowEntity);
+// }
+ }
+
+ @Override
+ public void agentUp(Long id) {
+ //根据邀请码获取用户信息
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
return;
}
- dappFundFlowEntity.setToHash(hash);
- dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
- dappFundFlowDao.updateById(dappFundFlowEntity);
-
+ 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(),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,dappMemberEntity.getInviteId());
+ if(2 <= bossCount){
+ dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BOSS.getCode(),dappMemberEntity.getId());
+ }
+ return;
+ }
}
public static void main(String[] args) {
--
Gitblit v1.9.1