diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index 1406de39..87ba5a19 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -1366,9 +1366,8 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { // TODO new 追加会员奖金拓展收益 CuMemberBonus cuMemberBonus = this.getCuMemberBonus(period, cuMemberBonusMap, pkMember, cuMemberSettleExt.getIncomeStatus(), cuMemberSettleExt.getPkSettleCountry(), cuMemberSettleExt.getPkRate()); - cuMemberBonus.setExpandIncome(pretaxIncome); - cuMemberBonus.setExpandNoCapping(pretaxIncome); cuMemberBonus.setExpandCapping(cuMemberBonusDelayAddDetail.getExpandCapping()); + cuMemberBonus.setExpandNoCapping(pretaxIncome); // 获取拓展收益奖项 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.setExpandNormalReal(ComputeUtil.computeMultiplyHalf(pretaxIncome)); cuMemberBonusExpand.setRemark(String.format(BonusMsgConstants.BONUS_EXPAND_DELAY, cuMemberSettleExt.getMemberCode() + cuMemberSettleExt.getMemberName())); - // 处理扣项,计算最终收益 BdBonusDeduct bdBonusDeduct = setDeplyBonusDetailDeduct(bonusConfigDTO, cuMemberBonusExpand); - // 处理实发小计、实发收益总计 - setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand); + + if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusExpand.getIncomeStatus()) { + // 处理实发小计、实发收益总计 + cuMemberBonus.setExpandIncome(pretaxIncome); + setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand); + } // TODO new 追加的一条延缓收益生成的拓展收益明细 cuMemberBonusExpandList.add(cuMemberBonusExpand); @@ -1500,7 +1502,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { // 追加会员奖金收益 CuMemberBonus cuMemberBonus = this.getCuMemberBonus(period, cuMemberBonusMap, pkMember, cuMemberSettleExt.getIncomeStatus(), cuMemberSettleExt.getPkSettleCountry(), cuMemberSettleExt.getPkRate()); - cuMemberBonus.setExpandIncome(pretaxIncome); cuMemberBonus.setExpandNoCapping(pretaxIncome); cuMemberBonus.setExpandCapping(expandCapping); @@ -1517,8 +1518,12 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { cuMemberBonusExpand.setRemark(String.format(BonusMsgConstants.BONUS_EXPAND_DELAY, cuMemberSettleExt.getMemberCode() + cuMemberSettleExt.getMemberName())); // 处理扣项,计算最终收益 BdBonusDeduct bdBonusDeduct = setDeplyBonusDetailDeduct(bonusConfigDTO, cuMemberBonusExpand); - // 处理实发小计、实发收益总计 - setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand); + + if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusExpand.getIncomeStatus()) { + // 处理实发小计、实发收益总计 + cuMemberBonus.setExpandIncome(pretaxIncome); + setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand); + } // TODO new 追加的一条延缓收益生成的拓展收益明细 cuMemberBonusExpandList.add(cuMemberBonusExpand);