## 赠品积分奖金类型调整;
This commit is contained in:
parent
115128b6e2
commit
6f2e2b4d8f
|
|
@ -1465,7 +1465,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
|||
if (giftPoint.compareTo(BigDecimal.ZERO) > 0 && null != sourceMember) {
|
||||
CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, sourceMember.getPkMember(),
|
||||
sourceMember.getIncomeStatus(), sourceMember.getPkSettleCountry(), sourceMember.getPkRate() == null ? saOrderExt.getPkRate() : sourceMember.getPkRate());
|
||||
int pkBonusItems = getPkBonusItems(bonusConfigDTO, sourceMember.getPkSettleCountry(), EBonusItems.RANGE_INCOME.getValue());
|
||||
int pkBonusItems = getPkBonusItems(bonusConfigDTO, sourceMember.getPkSettleCountry(), EBonusItems.GIFT_POINT.getValue());
|
||||
CuMemberBonusDetail cuMemberBonusDetail = getCuMemberBonusDetail(saOrderExt, sourceMember, cuMemberBonus, pkBonusItems);
|
||||
cuMemberBonusDetail.setPretaxIncome(giftPoint);
|
||||
setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusDetail, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate());
|
||||
|
|
@ -1479,7 +1479,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
|||
// 银卡 或 金卡会员推荐才有奖励
|
||||
CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, targetMember.getPkMember(),
|
||||
targetMember.getIncomeStatus(), targetMember.getPkSettleCountry(), targetMember.getPkRate() == null ? saOrderExt.getPkRate() : targetMember.getPkRate());
|
||||
int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMember.getPkSettleCountry(), EBonusItems.RANGE_INCOME.getValue());
|
||||
int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMember.getPkSettleCountry(), EBonusItems.GIFT_POINT.getValue());
|
||||
CuMemberBonusDetail cuMemberBonusDetail = getCuMemberBonusDetail(saOrderExt, targetMember, cuMemberBonus, pkBonusItems);
|
||||
cuMemberBonusDetail.setPretaxIncome(targetGiftPoint);
|
||||
setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusDetail, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate());
|
||||
|
|
|
|||
Loading…
Reference in New Issue