From b42b551f5b85df5ffbaeaa18c373b8a8f1a51953 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Dec 2022 10:42:56 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 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..c5e7d8f 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);
//获取每层用户的直推人数，判断能否获得这个层级的层级奖励
@@ -331,7 +344,7 @@
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);
@@ -354,6 +367,8 @@
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlow.getId());
}
+
+ dappSystemProfitDao.updateLevelProfitById(DappSystemProfit.ENUM_YES,dappSystemProfit.getId());
}
@Override
@@ -402,8 +417,7 @@
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());
@@ -424,31 +438,36 @@
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);
+ 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);
+// //金额
+// 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);
--
Gitblit v1.9.1