From 3632ce4e6191d76fe5f7c2ead761a948b7d5c3b8 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 21 May 2024 15:00:02 +0800
Subject: [PATCH] 会员等级的团队收益和平级收益

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 2665cb0..4a0720d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -1207,12 +1207,20 @@
                             //会员等级为ZERO_LEVEL,则不参与团队返佣
                             if(!MemberLevelNewEnum.ZERO_LEVEL.getType().equals(levelRef)){
                                 int compareLevel = MemberLevelNewEnum.ZERO_LEVEL.compareLevel(level, levelRef);
+
                                 DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                         levelRef, levelRef
                                 );
                                 TeamPerkDto teamPerkDto = JSONObject.parseObject(dataDictionaryCustom.getValue(), TeamPerkDto.class);
+
+                                DataDictionaryCustom dataDictionaryCustomLevel = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                                        level, level
+                                );
+                                TeamPerkDto teamPerkDtoLevel = JSONObject.parseObject(dataDictionaryCustomLevel.getValue(), TeamPerkDto.class);
                                 if(compareLevel == 0){//团队奖励
-                                    BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent())
+                                    BigDecimal subtract = new BigDecimal(teamPerkDto.getPerkPercent()).subtract(new BigDecimal(teamPerkDtoLevel.getPerkPercent()));
+
+                                    BigDecimal PerkPercent = subtract
                                             .multiply(new BigDecimal("0.01"));
                                     BigDecimal teamPerk = PerkPercent.multiply(profit).setScale(2,BigDecimal.ROUND_DOWN);
                                     /**

--
Gitblit v1.9.1