angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 顾客等级不累计业绩；

This commit is contained in:
cabbage 2025-07-23 09:53:31 +08:00
parent 8603ede008
commit 10e846a95f
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
View File

@ -441,7 +441,8 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
if (null == targetMemberSettleExt if (null == targetMemberSettleExt
|| ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory()
|| EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() || 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; continue;
} }
@ -480,11 +481,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
targetMemberSettleExt.setRBBalance(ComputeUtil.computeAdd(targetMemberSettleExt.getRBBalance(), saOrderExt.getUploadAchieve())); 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())) { if (ComputeUtil.compareValue(targetMemberSettleExt.getABalance()) && ComputeUtil.compareValue(targetMemberSettleExt.getBBalance())) {
// 国内量奖修改为考核不通过的不占用4-N，不算奖金 // 国内量奖修改为考核不通过的不占用4-N，不算奖金

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java
View File

@ -187,7 +187,8 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle {
if (targetMemberSettleExt == null if (targetMemberSettleExt == null
|| ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory()
|| EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() || 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; continue;
} }
@ -228,11 +229,6 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle {
} }
} }
if (EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) {
// 188 顾客等级只累计业绩，不算碰次
continue;
}
// 2025.05.14 对碰大小值走配置 // 2025.05.14 对碰大小值走配置
BigDecimal small = new BigDecimal("1440"); BigDecimal small = new BigDecimal("1440");
BigDecimal big = new BigDecimal("2880"); BigDecimal big = new BigDecimal("2880");

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
View File

@ -314,7 +314,8 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
if (null == targetMemberSettleExt if (null == targetMemberSettleExt
|| ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory()
|| EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() || 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; continue;
} }
@ -352,11 +353,6 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
targetMemberSettleExt.setRBBalance(ComputeUtil.computeAdd(targetMemberSettleExt.getRBBalance(), saOrderExt.getUploadAchieve())); 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())) { if (ComputeUtil.compareValue(targetMemberSettleExt.getABalance()) && ComputeUtil.compareValue(targetMemberSettleExt.getBBalance())) {
// 国内量奖修改为考核不通过的不占用4-N，不算奖金 // 国内量奖修改为考核不通过的不占用4-N，不算奖金

5
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
View File

@ -210,8 +210,9 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
if (null == targetMemberSettleExt if (null == targetMemberSettleExt
|| ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory()
|| EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() || 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; continue;
} }
if (EPlaceDept.LEFT_DEPT.getValue() == cuMemberSettleExt.getPlaceDept()) { if (EPlaceDept.LEFT_DEPT.getValue() == cuMemberSettleExt.getPlaceDept()) {