From 7cd5e4d9e5450aaf5617a1e69c14ceefb55c011b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Nov 2022 10:47:50 +0800
Subject: [PATCH] 20221117  挂机极差,以自己的等级为基准

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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..5e7f173 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
@@ -195,7 +195,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,8 +208,8 @@
             }
         }
         //生成流水佣金和盈利分成和流水记录,返回剩余盈利
-        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());
         //平台分成
         //平台拿走35%盈利分成和流水佣金剩下的全部
         BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
@@ -589,7 +591,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,10 +604,10 @@
             }
         }
         //生成流水佣金和盈利分成和流水记录,返回剩余盈利
-        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());
         //平台分成
-        //平台拿走35%盈利分成和流水佣金剩下的全部
+        //平台拿走40% - 盈利分成和流水佣金剩下的全部
         BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
         BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,systemAdd,igtOnHookPlanOrder.getId());
         //个人固定拿走60%

--
Gitblit v1.9.1