From c0182f86d8461f16a147c1384f916c43171d1762 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 14:36:24 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 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..8157cba 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
@@ -340,7 +340,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 +361,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(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlow.getId());
@@ -383,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;
}
@@ -420,7 +420,10 @@
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());
@@ -447,36 +450,40 @@
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);
-
+ 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(String inviteId) {
+ public void agentUp(Long id) {
//根据邀请码获取用户信息
- DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(inviteId);
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
if(ObjectUtil.isEmpty(dappMemberEntity)){
return;
}
@@ -486,17 +493,19 @@
}
//当前为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;
}
}
--
Gitblit v1.9.1