From b6660fa4e0ea8c41148a1b2460f7368d9d6c21df Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 13 Oct 2025 11:56:38 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=B2=BE=E5=93=81=E4=B8=93=E5=8C=BA?= =?UTF-8?q?=E7=9B=B4=E6=8E=A8=E3=80=81=E9=98=B6=E6=AE=B5=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=94=B1=E9=87=91=E9=A2=9D=E6=94=B9=E4=B8=BA=E4=B8=9A=E7=BB=A9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/service/impl/BonusSettleRangeHandle.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 0b474e6e..5b3fc057 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 @@ -347,7 +347,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 一阶段收益 -- 来源订单金额 stageList.addAll(this.calculateStageIncome(cuMemberBonusStageList, cuMemberBonusMap, bonusConfigDTO, period, memberRangeExtMap, sourceMember, saOrderExt, settleStartDate, rangeTableName, rangeDetailTableName)); - // 直推收益 -- 来源订单金额,直推拿金额的10% + // 直推收益 -- 来源订单金额,直推拿业绩的10% this.calculateDirectIncome(cuMemberBonusPushList, memberRangeExtMap, sourceMember, saOrderExt, bonusConfigDTO, period, cuMemberBonusMap); // 领导级差收益、平级收益 -- 来源PV @@ -568,8 +568,8 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { log.warn("直推收益:订单会员推荐人不满足计算奖金条件, memberCode: {}", targetMember.getMemberCode()); return; } - // 订单金额 - BigDecimal orderAmount = saOrderExt.getOrderAmount(); + // 订单金额 -- 2025.10.13直推改为按业绩来处理 + BigDecimal orderAmount = saOrderExt.getOrderAchieve(); // 奖金金额 BigDecimal bonusIncome = orderAmount.multiply(RetailConstants.DIRECT_BONUS_RATIO); @@ -693,8 +693,8 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { int newPointInt; if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) { - // 精品专区按订单金额计算 - BigDecimal orderAmount = saOrderExt.getOrderAmount(); + // 精品专区按订单金额计算 -- 2025.10.13精品专区改为按业绩处理 + BigDecimal orderAmount = saOrderExt.getOrderAchieve(); // 订单金额除50取整,为新増点位数量 newPointInt = orderAmount.divide(RetailConstants.POINT_VAL, 0, RoundingMode.DOWN).intValue(); if (orderAmount.compareTo(BonusConstants.GIFT_TWO_AMOUNT) >= 0 && sourceMember.getGiftPoint() < 2) {