angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 复购级差计算先乘再减；

This commit is contained in:
cabbage 2025-07-12 11:54:50 +08:00
parent 3ebcfca6f7
commit d0781ce37a
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -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++;
}
}

18
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java
View File

@ -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");