From 5de0a3ee3261066dbb996d8d26b41051c66a41d3 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sat, 12 Jul 2025 11:54:50 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=A4=8D=E8=B4=AD=E7=BA=A7=E5=B7=AE?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=85=88=E4=B9=98=E5=86=8D=E5=87=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BonusSettleRangeHandle.java | 16 ++++++++-------- .../common/core/constant/RetailConstants.java | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 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 69034e1a..aede97b0 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 @@ -596,32 +596,32 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // V2 拿 8，或者减去之前累计 rangeBonusIncome = RetailConstants.REPURCHASE_V2.multiply(boxNum).subtract(totalBonus); // 前面累计的奖金 - totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V2.subtract(totalBonus).multiply(boxNum)); + totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V2.multiply(boxNum).subtract(totalBonus)); } else if (EGrade.MAKER.getValue() == targetGradeValue) { // V3 拿 10，或者减去之前累计 rangeBonusIncome = RetailConstants.REPURCHASE_V3_1.multiply(boxNum).subtract(totalBonus); // 前面累计的奖金 - totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V3_1.subtract(totalBonus).multiply(boxNum)); + totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V3_1.multiply(boxNum).subtract(totalBonus)); } else if (EGrade.VIP.getValue() == targetGradeValue) { // V4 拿 20，或者减去之前累计 rangeBonusIncome = RetailConstants.REPURCHASE_V4.multiply(boxNum).subtract(totalBonus); // 前面累计的奖金 - totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V4.subtract(totalBonus).multiply(boxNum)); + totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V4.multiply(boxNum).subtract(totalBonus)); } else if (EGrade.S_VIP.getValue() == targetGradeValue) { // V5 拿 20.8，或者减去之前累计 rangeBonusIncome = RetailConstants.REPURCHASE_V5.multiply(boxNum).subtract(totalBonus); // 前面累计的奖金 - totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V5.subtract(totalBonus).multiply(boxNum)); + totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V5.multiply(boxNum).subtract(totalBonus)); } else if (EGrade.BRANCH_COMPANY.getValue() == targetGradeValue) { // V6 拿 22，或者减去之前累计 rangeBonusIncome = RetailConstants.REPURCHASE_V6.multiply(boxNum).subtract(totalBonus); // 前面累计的奖金 - totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V6.subtract(totalBonus).multiply(boxNum)); + totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V6.multiply(boxNum).subtract(totalBonus)); } else if (EGrade.COMPANY.getValue() == targetGradeValue) { // V7 拿 24，或者减去之前累计 rangeBonusIncome = RetailConstants.REPURCHASE_V7.multiply(boxNum).subtract(totalBonus); // 前面累计的奖金 - totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V7.subtract(totalBonus).multiply(boxNum)); + totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V7.multiply(boxNum).subtract(totalBonus)); } } else if (EGrade.MAKER.getValue() == beforeGradeValue && EGrade.MAKER.getValue() == targetGradeValue) { @@ -630,13 +630,13 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // V3第一平级 推拿 12，或者减去之前累计 rangeBonusIncome = RetailConstants.REPURCHASE_V3_2.multiply(boxNum).subtract(totalBonus); // 前面累计的奖金 - totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V3_2.subtract(totalBonus).multiply(boxNum)); + totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V3_2.multiply(boxNum).subtract(totalBonus)); v3Count++; } else if (v3Count == 2) { // V3第二平级 推拿 13，或者减去之前累计 rangeBonusIncome = RetailConstants.REPURCHASE_V3_3.multiply(boxNum).subtract(totalBonus); // 前面累计的奖金 - totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V3_3.subtract(totalBonus).multiply(boxNum)); + totalBonus = totalBonus.add(RetailConstants.REPURCHASE_V3_3.multiply(boxNum).subtract(totalBonus)); v3Count++; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java index ae53c1d0..9c053ac2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java @@ -65,15 +65,15 @@ public class RetailConstants { public static final BigDecimal V7_V3 = new BigDecimal("2400"); /** - * 会员 推 合伙人 1200 - * VIP 推 合伙人 1600 - * 合伙人1 推 合伙人 2000 - * 合伙人2 推 合伙人 2400 - * 合伙人3 推 合伙人 2600 - * 博羚店主 推 合伙人 4000 - * 高级店主 推 合伙人 4160 - * 分公司 推 合伙人 4400 - * 总公司 推 合伙人 4800 + * 会员 推 博羚店主 1200 + * VIP 推 博羚店主 1600 + * 合伙人1 推 博羚店主 2000 + * 合伙人2 推 博羚店主 2400 + * 合伙人3 推 博羚店主 2600 + * 博羚店主 推 博羚店主 4000 + * 高级店主 推 博羚店主 4160 + * 分公司 推 博羚店主 4400 + * 总公司 推 博羚店主 4800 */ public static final BigDecimal V1_V4 = new BigDecimal("1200"); public static final BigDecimal V2_V4 = new BigDecimal("1600");