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

## 拓展收益烧伤状态处理；

This commit is contained in:
cabbage 2025-04-15 19:31:25 +08:00
parent 37fc6bc778
commit c53173fd7e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -933,14 +933,12 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
} }
/** /**
* @param settleDateStr 结算日期 * 计算报单服务费
* @param period 期间
* @Description: 计算报单服务费
* 车奖 全球分红 有奖衔的会员，复购考核通过的，根据对应奖衔可拿代数配置拿下面代数的（推荐+拓展+领导+分红）奖金合计为基数的相应代数的比率（配置值） * 车奖 全球分红 有奖衔的会员，复购考核通过的，根据对应奖衔可拿代数配置拿下面代数的（推荐+拓展+领导+分红）奖金合计为基数的相应代数的比率（配置值）
* 跟领导奖一样的算法，不算启动卡 * 跟领导奖一样的算法，不算启动卡
* @return: List<CuMemberBonusCoach> *
* @Author: sui q * @param settleDateStr 结算日期
* @Date: 2022/11/17 14:14 * @param period 期间
*/ */
List<CuMemberBonusDetail> calculateShareBonus(String settleDateStr, BonusConfigDTO bonusConfigDTO, Integer period, List<CuMemberBonusDetail> calculateShareBonus(String settleDateStr, BonusConfigDTO bonusConfigDTO, Integer period,
Map<Long, CuMemberBonus> cuMemberBonusMap, Map<Long, CuAwardsControl> cuAwardsControlMap) { Map<Long, CuMemberBonus> cuMemberBonusMap, Map<Long, CuAwardsControl> cuAwardsControlMap) {
@ -1134,8 +1132,14 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberBonus.getExpandIncome(), cuMemberBonus.getRepurExpandIncome()), bdGrade.getExpandCapping())) { if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberBonus.getExpandIncome(), cuMemberBonus.getRepurExpandIncome()), bdGrade.getExpandCapping())) {
// 拓展收益 累加 复购收益 >= 封顶值 // 拓展收益 累加 复购收益 >= 封顶值
if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusExpand.getIncomeStatus()) { if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusExpand.getIncomeStatus()) {
// TODO new V3 V4 没有烧伤，改为延缓发放
if (EGrade.VIP.getValue() == bdGrade.getGradeValue()
|| EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) {
cuMemberBonusExpand.setIncomeStatus(EBonusIncomeStatus.DELAY_GRANT.getValue());
} else {
cuMemberBonusExpand.setIncomeStatus(EBonusIncomeStatus.FIRE_BURN.getValue()); cuMemberBonusExpand.setIncomeStatus(EBonusIncomeStatus.FIRE_BURN.getValue());
} }
}
expandIncome = ComputeUtil.computeSubtract(bdGrade.getExpandCapping(), ComputeUtil.computeAdd(cuMemberBonus.getExpandIncome(), cuMemberBonus.getRepurExpandIncome())); expandIncome = ComputeUtil.computeSubtract(bdGrade.getExpandCapping(), ComputeUtil.computeAdd(cuMemberBonus.getExpandIncome(), cuMemberBonus.getRepurExpandIncome()));
} else if (ComputeUtil.compareGreaterThan(expandIncome, bdGrade.getExpandCapping())) { } else if (ComputeUtil.compareGreaterThan(expandIncome, bdGrade.getExpandCapping())) {
BigDecimal realIncome = ComputeUtil.computeSubtract(bdGrade.getExpandCapping(), ComputeUtil.computeAdd(cuMemberBonus.getExpandIncome(), cuMemberBonus.getRepurExpandIncome())); BigDecimal realIncome = ComputeUtil.computeSubtract(bdGrade.getExpandCapping(), ComputeUtil.computeAdd(cuMemberBonus.getExpandIncome(), cuMemberBonus.getRepurExpandIncome()));