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-23 10:04:36 +08:00
parent c906010ebf
commit 86c8a74816
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1366,9 +1366,8 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
// TODO new 追加会员奖金拓展收益 // TODO new 追加会员奖金拓展收益
CuMemberBonus cuMemberBonus = this.getCuMemberBonus(period, cuMemberBonusMap, pkMember, CuMemberBonus cuMemberBonus = this.getCuMemberBonus(period, cuMemberBonusMap, pkMember,
cuMemberSettleExt.getIncomeStatus(), cuMemberSettleExt.getPkSettleCountry(), cuMemberSettleExt.getPkRate()); cuMemberSettleExt.getIncomeStatus(), cuMemberSettleExt.getPkSettleCountry(), cuMemberSettleExt.getPkRate());
cuMemberBonus.setExpandIncome(pretaxIncome);
cuMemberBonus.setExpandNoCapping(pretaxIncome);
cuMemberBonus.setExpandCapping(cuMemberBonusDelayAddDetail.getExpandCapping()); cuMemberBonus.setExpandCapping(cuMemberBonusDelayAddDetail.getExpandCapping());
cuMemberBonus.setExpandNoCapping(pretaxIncome);
// 获取拓展收益奖项 // 获取拓展收益奖项
Integer pkBonusItems = getPkBonusItems(bonusConfigDTO, cuMemberBonusDelayAddDetail.getPkCountry(), EBonusItems.EXPANSION_INCOME.getValue()); Integer pkBonusItems = getPkBonusItems(bonusConfigDTO, cuMemberBonusDelayAddDetail.getPkCountry(), EBonusItems.EXPANSION_INCOME.getValue());
@ -1384,11 +1383,14 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
cuMemberBonusExpand.setExpandNormalHalf(ComputeUtil.computeMultiplyHalf(cuMemberBonusDelayAddDetail.getExpandCapping())); cuMemberBonusExpand.setExpandNormalHalf(ComputeUtil.computeMultiplyHalf(cuMemberBonusDelayAddDetail.getExpandCapping()));
cuMemberBonusExpand.setExpandNormalReal(ComputeUtil.computeMultiplyHalf(pretaxIncome)); cuMemberBonusExpand.setExpandNormalReal(ComputeUtil.computeMultiplyHalf(pretaxIncome));
cuMemberBonusExpand.setRemark(String.format(BonusMsgConstants.BONUS_EXPAND_DELAY, cuMemberSettleExt.getMemberCode() + cuMemberSettleExt.getMemberName())); cuMemberBonusExpand.setRemark(String.format(BonusMsgConstants.BONUS_EXPAND_DELAY, cuMemberSettleExt.getMemberCode() + cuMemberSettleExt.getMemberName()));
// 处理扣项，计算最终收益 // 处理扣项，计算最终收益
BdBonusDeduct bdBonusDeduct = setDeplyBonusDetailDeduct(bonusConfigDTO, cuMemberBonusExpand); BdBonusDeduct bdBonusDeduct = setDeplyBonusDetailDeduct(bonusConfigDTO, cuMemberBonusExpand);
// 处理实发小计、实发收益总计
setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand); if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusExpand.getIncomeStatus()) {
// 处理实发小计、实发收益总计
cuMemberBonus.setExpandIncome(pretaxIncome);
setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand);
}
// TODO new 追加的一条延缓收益生成的拓展收益明细 // TODO new 追加的一条延缓收益生成的拓展收益明细
cuMemberBonusExpandList.add(cuMemberBonusExpand); cuMemberBonusExpandList.add(cuMemberBonusExpand);
@ -1500,7 +1502,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
// 追加会员奖金收益 // 追加会员奖金收益
CuMemberBonus cuMemberBonus = this.getCuMemberBonus(period, cuMemberBonusMap, pkMember, CuMemberBonus cuMemberBonus = this.getCuMemberBonus(period, cuMemberBonusMap, pkMember,
cuMemberSettleExt.getIncomeStatus(), cuMemberSettleExt.getPkSettleCountry(), cuMemberSettleExt.getPkRate()); cuMemberSettleExt.getIncomeStatus(), cuMemberSettleExt.getPkSettleCountry(), cuMemberSettleExt.getPkRate());
cuMemberBonus.setExpandIncome(pretaxIncome);
cuMemberBonus.setExpandNoCapping(pretaxIncome); cuMemberBonus.setExpandNoCapping(pretaxIncome);
cuMemberBonus.setExpandCapping(expandCapping); cuMemberBonus.setExpandCapping(expandCapping);
@ -1517,8 +1518,12 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
cuMemberBonusExpand.setRemark(String.format(BonusMsgConstants.BONUS_EXPAND_DELAY, cuMemberSettleExt.getMemberCode() + cuMemberSettleExt.getMemberName())); cuMemberBonusExpand.setRemark(String.format(BonusMsgConstants.BONUS_EXPAND_DELAY, cuMemberSettleExt.getMemberCode() + cuMemberSettleExt.getMemberName()));
// 处理扣项，计算最终收益 // 处理扣项，计算最终收益
BdBonusDeduct bdBonusDeduct = setDeplyBonusDetailDeduct(bonusConfigDTO, cuMemberBonusExpand); BdBonusDeduct bdBonusDeduct = setDeplyBonusDetailDeduct(bonusConfigDTO, cuMemberBonusExpand);
// 处理实发小计、实发收益总计
setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand); if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusExpand.getIncomeStatus()) {
// 处理实发小计、实发收益总计
cuMemberBonus.setExpandIncome(pretaxIncome);
setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand);
}
// TODO new 追加的一条延缓收益生成的拓展收益明细 // TODO new 追加的一条延缓收益生成的拓展收益明细
cuMemberBonusExpandList.add(cuMemberBonusExpand); cuMemberBonusExpandList.add(cuMemberBonusExpand);