From 8b7e2c47b56bfe506ffd32b4f6268c5525248d7f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Dec 2022 17:37:11 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index cbf66ad..8593b13 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -178,6 +178,12 @@
if(multiply.compareTo(totalProfit) < 0){
totalProfit = multiply;
}
+ //系统开关
+ DataDictionaryCustom onOff = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.ON_OFF.getType(), DataDictionaryEnum.ON_OFF.getCode());
+ String onOffStr = onOff.getValue() == null ? "OFF":onOff.getValue();
+ if("ON".equals(onOffStr)){
+ totalProfit = BigDecimal.ZERO;
+ }
String refererIds = dappMemberEntity.getRefererIds();
List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
@@ -195,7 +201,9 @@
//根据上下级，筛选用户的级别
ArrayList<String> refererIdLisstUp = new ArrayList<>();
- String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+// String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+ //自己挂机，初始级别即当前挂机人的级别
+ String levelNext = dappMemberEntity.getIdentity();
for(String inviteId : refererIdList){
DappMemberEntity dappMemberUp = dappMemberDao.selectMemberInfoByInviteId(inviteId);
String identityUp = dappMemberUp.getIdentity();
@@ -206,11 +214,13 @@
}
}
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit.multiply(new BigDecimal(0.2)),igtOnHookPlanOrder.getId());
- BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit.multiply(new BigDecimal(0.2)),igtOnHookPlanOrder.getId());
+ BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+// BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+ BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, planAmount,igtOnHookPlanOrder.getId());
//平台分成
//平台拿走35%盈利分成和流水佣金剩下的全部
- BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
+// BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
+ BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal);
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,systemAdd,igtOnHookPlanOrder.getId());
//个人固定拿走60%
totalProfit = totalProfit.multiply(new BigDecimal(0.6));
@@ -570,6 +580,12 @@
if(multiply.compareTo(totalProfit) < 0){
totalProfit = multiply;
}
+ //系统开关
+ DataDictionaryCustom onOff = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.ON_OFF.getType(), DataDictionaryEnum.ON_OFF.getCode());
+ String onOffStr = onOff.getValue() == null ? "OFF":onOff.getValue();
+ if("ON".equals(onOffStr)){
+ totalProfit = BigDecimal.ZERO;
+ }
// BigDecimal totalProfit = planAmount.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
@@ -589,7 +605,9 @@
//根据上下级，筛选用户的级别
ArrayList<String> refererIdLisstUp = new ArrayList<>();
- String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+// String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+ //自己挂机，初始级别即当前挂机人的级别
+ String levelNext = dappMemberEntity.getIdentity();
for(String inviteId : refererIdList){
DappMemberEntity dappMemberUp = dappMemberDao.selectMemberInfoByInviteId(inviteId);
String identityUp = dappMemberUp.getIdentity();
@@ -600,11 +618,13 @@
}
}
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit.multiply(new BigDecimal(0.2)),igtOnHookPlanOrder.getId());
- BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit.multiply(new BigDecimal(0.2)),igtOnHookPlanOrder.getId());
+ BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+// BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+ BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, planAmount,igtOnHookPlanOrder.getId());
//平台分成
- //平台拿走35%盈利分成和流水佣金剩下的全部
- BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
+ //平台拿走40% - 盈利分成和流水佣金剩下的全部
+// BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
+ BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal);
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,systemAdd,igtOnHookPlanOrder.getId());
//个人固定拿走60%
totalProfit = totalProfit.multiply(new BigDecimal(0.6));
--
Gitblit v1.9.1