From 10e846a95f3bbf8865d2d1eddffbd39e79d1b63b Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 23 Jul 2025 09:53:31 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E9=A1=BE=E5=AE=A2=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E4=B8=8D=E7=B4=AF=E8=AE=A1=E4=B8=9A=E7=BB=A9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BonusSettleFirstPurchaseHandle.java | 8 ++------ .../bonus/service/impl/BonusSettleNewExpandHandle.java | 8 ++------ .../bonus/service/impl/BonusSettlePurchaseHandle.java | 8 ++------ .../bonus/bonus/service/impl/BonusSettleServiceImpl.java | 5 +++-- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index 0664d1f2..6d96b645 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -441,7 +441,8 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue()) { + || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() + || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { // 会员不满足计算奖金条件，跳过 continue; } @@ -480,11 +481,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { targetMemberSettleExt.setRBBalance(ComputeUtil.computeAdd(targetMemberSettleExt.getRBBalance(), saOrderExt.getUploadAchieve())); } - if (EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { - // 188 顾客等级只累计业绩，不算碰次 - continue; - } - // 判断左右区是否有值，左右区有值有碰次 if (ComputeUtil.compareValue(targetMemberSettleExt.getABalance()) && ComputeUtil.compareValue(targetMemberSettleExt.getBBalance())) { // 国内量奖修改为考核不通过的不占用4-N，不算奖金 diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java index b558b899..50cad3e8 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java @@ -187,7 +187,8 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle { if (targetMemberSettleExt == null || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue()) { + || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() + || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { // 会员不满足计算奖金条件，跳过 continue; } @@ -228,11 +229,6 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle { } } - if (EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { - // 188 顾客等级只累计业绩，不算碰次 - continue; - } - // 2025.05.14 对碰大小值走配置 BigDecimal small = new BigDecimal("1440"); BigDecimal big = new BigDecimal("2880"); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java index d7f86710..3e6b6167 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java @@ -314,7 +314,8 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue()) { + || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() + || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { // 会员不满足计算奖金条件，跳过 continue; } @@ -352,11 +353,6 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { targetMemberSettleExt.setRBBalance(ComputeUtil.computeAdd(targetMemberSettleExt.getRBBalance(), saOrderExt.getUploadAchieve())); } - if (EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { - // 188 顾客等级只累计业绩，不算碰次 - continue; - } - // 判断左右区是否有值，左右区有值有碰次 if (ComputeUtil.compareValue(targetMemberSettleExt.getABalance()) && ComputeUtil.compareValue(targetMemberSettleExt.getBBalance())) { // 国内量奖修改为考核不通过的不占用4-N，不算奖金 diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index b3e7d075..a33bb7f7 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -210,8 +210,9 @@ public class BonusSettleServiceImpl implements IBonusSettleService { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue()) { - // 会员不满足计算奖金条件，跳过 + || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() + || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + // 会员不满足计算条件，跳过 continue; } if (EPlaceDept.LEFT_DEPT.getValue() == cuMemberSettleExt.getPlaceDept()) {