Merge remote-tracking branch 'origin/bd_dev' into bd_dev
This commit is contained in:
commit
ad0374c56a
|
@ -907,7 +907,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
|
||||||
BigDecimal tmpCal = this.handleAreaBonus(saOrderExt, sourceMemberSettleExt, targetMemberSettleExt, period, bonusConfigDTO, regionAreaConfigMap,
|
BigDecimal tmpCal = this.handleAreaBonus(saOrderExt, sourceMemberSettleExt, targetMemberSettleExt, period, bonusConfigDTO, regionAreaConfigMap,
|
||||||
cuMemberBonusMap, cuMemberBonusRangeList, EAreaType.CITY, beforeBonusCal);
|
cuMemberBonusMap, cuMemberBonusRangeList, EAreaType.CITY, beforeBonusCal);
|
||||||
if (null != tmpCal) {
|
if (null != tmpCal) {
|
||||||
beforeBonusCal = tmpCal;
|
beforeBonusCal = beforeBonusCal.add(tmpCal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue