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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
sangelxiu1 2025-10-13 12:03:46 +08:00
parent f9811b92e3 d8605f523c
commit eec0914773
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -347,7 +347,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
// 一阶段收益 -- 来源订单金额
stageList.addAll(this.calculateStageIncome(cuMemberBonusStageList, cuMemberBonusMap, bonusConfigDTO, period,
memberRangeExtMap, sourceMember, saOrderExt, settleStartDate, rangeTableName, rangeDetailTableName));
// 直推收益 -- 来源订单金额，直推拿金额的10%
// 直推收益 -- 来源订单金额，直推拿业绩的10%
this.calculateDirectIncome(cuMemberBonusPushList, memberRangeExtMap, sourceMember, saOrderExt,
bonusConfigDTO, period, cuMemberBonusMap);
// 领导级差收益、平级收益 -- 来源PV
@ -568,8 +568,8 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
log.warn("直推收益：订单会员推荐人不满足计算奖金条件, memberCode: {}", targetMember.getMemberCode());
return;
}
// 订单金额
BigDecimal orderAmount = saOrderExt.getOrderAmount();
// 订单金额 -- 2025.10.13直推改为按业绩来处理
BigDecimal orderAmount = saOrderExt.getOrderAchieve();
// 奖金金额
BigDecimal bonusIncome = orderAmount.multiply(RetailConstants.DIRECT_BONUS_RATIO);
@ -693,8 +693,8 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
int newPointInt;
if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType()
|| EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) {
// 精品专区按订单金额计算
BigDecimal orderAmount = saOrderExt.getOrderAmount();
// 精品专区按订单金额计算 -- 2025.10.13精品专区改为按业绩处理
BigDecimal orderAmount = saOrderExt.getOrderAchieve();
// 订单金额除50取整，为新増点位数量
newPointInt = orderAmount.divide(RetailConstants.POINT_VAL, 0, RoundingMode.DOWN).intValue();
if (orderAmount.compareTo(BonusConstants.GIFT_TWO_AMOUNT) >= 0 && sourceMember.getGiftPoint() < 2) {