From 19b525873d0e740d6ea31e939eb921bb711c8db6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 10:52:11 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index f250aff..3a684a9 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -85,13 +85,56 @@
walletInfo.setAccountType(memberInfo.getAccountType());
DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(memberInfo.getId(),DappSystemProfit.STATE_IN);
- walletInfo.setSystemProfitId(dappSystemProfit.getId());
+ walletInfo.setSystemProfitId(ObjectUtil.isEmpty(dappSystemProfit) ? 0L : dappSystemProfit.getId());
BigDecimal directProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),3,2);
walletInfo.setDirectProfit(directProfit);
BigDecimal levelProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),4,2);
walletInfo.setLevelProfit(levelProfit);
BigDecimal luckyProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),7,2);
walletInfo.setLuckyProfit(luckyProfit);
+// //获取当前是第几轮队列
+// String redisKey = "QUEUE_COUNT";
+// 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)){
+// redisUtils.set(redisKey,queueCount,0L);
+// memberOutCount = queueCount;
+// }
+// //出局条件的人数
+// /**
+// * 初始大小 5+4*0
+// * 1 1,2,3,4,5 1出局 5+4*0
+// * 2 2,3,4,5,1(复投),7,8,9,10 2出局 5+4*1
+// * 3 3,4,5,1(复投),7,8,9,10,2(复投),12,13,14,15 3出局 5+4*2
+// * 4 4,5,1(复投),7,8,9,10,2(复投),12,13,14,15,3(复投),17,18,19,20 4出局 5+4*3
+// */
+// Integer memberCount = Integer.parseInt(memberOutCount) * 4 + 5;
+// //判断当前是否符合出局条件
+// QueryWrapper<DappSystemProfit> objectQueryWrapper = new QueryWrapper<>();
+// objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
+// //实际投资人数
+// Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
+// BigDecimal memberRunPercent = BigDecimal.ZERO;
+// List<DappSystemProfit> dappSystemProfits = dappSystemProfitDao.selectDappSysstemProfitByState(DappSystemProfit.STATE_IN);
+// if(CollUtil.isEmpty(dappSystemProfits)){
+// walletInfo.setRunPercent(memberRunPercent);
+// }
+//
+// for(int i=0;i<dappSystemProfits.size();i++){
+// DappSystemProfit systemProfit = dappSystemProfits.get(i);
+// if(memberInfo.getId() == systemProfit.getMemberId()){
+// BigDecimal size = new BigDecimal(dappSystemProfits.size());
+// memberRunPercent = size.subtract(new BigDecimal(i+1));
+// }
+// }
+// BigDecimal runPercent = memberRunPercent.divide(new BigDecimal(memberCount), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
+// walletInfo.setRunPercent(runPercent);
+ if(DataDictionaryEnum.BIG_BOSS.getCode().equals(memberInfo.getAccountType())){
+ walletInfo.setRunPercent(new BigDecimal(100));
+ }else{
+ walletInfo.setRunPercent(new BigDecimal(90));
+ }
return walletInfo;
}
@@ -142,8 +185,8 @@
*/
@Override
public Long transfer(TransferDto transferDto) {
- DappMemberEntity member = LoginUserUtil.getAppUser();
-// DappMemberEntity member = dappMemberDao.selectById(transferDto.getMemberId());
+// DappMemberEntity member = LoginUserUtil.getAppUser();
+ DappMemberEntity member = dappMemberDao.selectById(transferDto.getMemberId());
String upgrade = redisUtils.getString("APP_UPGRADE");
if ("upgrade".equals(upgrade)) {
@@ -193,7 +236,7 @@
}
//插入一条会员入列记录,即加入动能队列
- DappSystemProfit dappSystemProfit = new DappSystemProfit(member.getId(), transferDto.getAmount());
+ DappSystemProfit dappSystemProfit = new DappSystemProfit(member.getId(), flow.getAmount());
dappSystemProfitDao.insert(dappSystemProfit);
flow.setFromHash(transferDto.getTxHash());
@@ -207,7 +250,7 @@
//直接拿走0.05个BNB放入技术方
DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
- DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
dappFundFlowDao.insert(systemProfitFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
@@ -219,9 +262,9 @@
DataDictionaryCustom directProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
BigDecimal directProfitStr = new BigDecimal(StrUtil.isEmpty(directProfitSet.getValue()) ? "0.3" : directProfitSet.getValue());
BigDecimal subtract = transferDto.getAmount().subtract(new BigDecimal(systemProfitStr));
- BigDecimal directProfit = subtract.multiply(directProfitStr).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal directProfit = subtract.multiply(directProfitStr).setScale(6,BigDecimal.ROUND_DOWN);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlow.getId());
@@ -426,7 +469,7 @@
//直接拿走0.05个BNB放入技术方
DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
- DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
dappFundFlowDao.insert(systemProfitFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
@@ -437,9 +480,9 @@
DataDictionaryCustom directProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
BigDecimal directProfitStr = new BigDecimal(StrUtil.isEmpty(directProfitSet.getValue()) ? "0.3" : directProfitSet.getValue());
- BigDecimal directProfit = (transferDto.getAmount().subtract(new BigDecimal(systemProfitStr))).multiply(directProfitStr).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal directProfit = (transferDto.getAmount().subtract(new BigDecimal(systemProfitStr))).multiply(directProfitStr).setScale(6,BigDecimal.ROUND_DOWN);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlow.getId());
--
Gitblit v1.9.1