From 2eb7015c8acffee7ae3fbe69981e32b36e9db98d Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 28 Oct 2025 10:15:59 +0800 Subject: [PATCH] =?UTF-8?q?##=20451=E5=B9=B3=E7=BA=A7=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=9C=80=E8=A6=81=E5=88=A4=E6=96=AD=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E5=92=8C=E4=B8=8A=E4=B8=80=E7=BA=A7=E7=9A=84=E5=A5=96?= =?UTF-8?q?=E8=A1=94=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/service/impl/BonusSettleRangeHandle.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index 8e3f5c3b..5329c7a6 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -1348,9 +1348,14 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { beforeRangeRatio = bdAwards.getRangeRatio(); beforeAwardsValue = calAwardsValue; - } else if (EAwards.GLOBAL_CHAIRMAN.getValue() == beforeAwardsValue && beforeSameAlgebra < 3 - && EOrderType.DISCOUNT_ORDER.getValue() != saOrderExt.getOrderType()) { - // 前一个等级是皇冠大使，需要有3代平级（五折专区不走平级收益） + } else if (EAwards.GLOBAL_CHAIRMAN.getValue() == beforeAwardsValue + && EAwards.GLOBAL_CHAIRMAN.getValue() == calAwardsValue + && beforeSameAlgebra < 3 + && (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() + || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType() + || EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) + ) { + // 前一个等级是皇冠大使 当前会员等级是皇冠大使，需要有3代平级（41、42、43有平级收益） sameBonusIncome = orderAchieve.multiply(BonusConstants.SAME_LEVEL_RATIO).multiply(bdAwards.getSameLevelRatio()); beforeSameAlgebra += 1; }