From fb05529caccb87b9b40f513781178e13ef76dcae Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Nov 2022 15:12:54 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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 601999f..18477a2 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
@@ -9,6 +9,7 @@
import cc.mrbird.febs.dapp.dto.ApiStartDto;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
+import cc.mrbird.febs.dapp.enumerate.MemberLevelEnum;
import cc.mrbird.febs.dapp.enumerate.MemberOnHookPlanEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.ApiIgtOnHookPlanService;
@@ -191,12 +192,28 @@
// }
// }
// }
+
+ //根据上下级，筛选用户的级别
+ ArrayList<String> refererIdLisstUp = new ArrayList<>();
+// String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+ //自己挂机，初始级别即当前挂机人的级别
+ String levelNext = dappMemberEntity.getIdentity();
+ for(String inviteId : refererIdList){
+ DappMemberEntity dappMemberUp = dappMemberDao.selectMemberInfoByInviteId(inviteId);
+ String identityUp = dappMemberUp.getIdentity();
+ int compareLevelResult = MemberLevelEnum.LEVEL_MB.compareLevel(identityUp, levelNext);
+ if(0 < compareLevelResult){
+ levelNext = identityUp;
+ refererIdLisstUp.add(inviteId);
+ }
+ }
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit,igtOnHookPlanOrder.getId());
- //生成流水佣金和盈利分成和流水记录，返回盈利分成和流水佣金总共分成
-// BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit,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);
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,systemAdd,igtOnHookPlanOrder.getId());
//个人固定拿走60%
@@ -573,10 +590,28 @@
// }
// }
// }
+
+ //根据上下级，筛选用户的级别
+ ArrayList<String> refererIdLisstUp = new ArrayList<>();
+// String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+ //自己挂机，初始级别即当前挂机人的级别
+ String levelNext = dappMemberEntity.getIdentity();
+ for(String inviteId : refererIdList){
+ DappMemberEntity dappMemberUp = dappMemberDao.selectMemberInfoByInviteId(inviteId);
+ String identityUp = dappMemberUp.getIdentity();
+ int compareLevelResult = MemberLevelEnum.LEVEL_MB.compareLevel(identityUp, levelNext);
+ if(0 < compareLevelResult){
+ levelNext = identityUp;
+ refererIdLisstUp.add(inviteId);
+ }
+ }
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit,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%盈利分成和流水佣金剩下的全部
+ //平台拿走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%
--
Gitblit v1.9.1