BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 3adaf319f668e38f786dfa679ac627dcc9c25c86

Authored by 芋道源码
Committed by GitHub
2 parents 7c397bbf 588fd8f0

Merge pull request #1264 from dadiyang/fix/trade-reward-givepoint-order-level 

[BUG] 商城满减送活动：活动赠送的积分支付后不发放，退款时却照扣，用户积分净亏
Inline Side-by-side
Showing 1 changed file with 3 additions and 0 deletions
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
  View file @3adaf31
... ... @@ -101,6 +101,9 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
101 101 TradePriceCalculateRespBO.OrderItem orderItem = orderItems.get(i);
102 102 orderItem.setGivePoint(orderItem.getGivePoint() + dividePoints.get(i));
103 103 }
  104 + // 订单项赠送积分变化后，同步重算订单级 givePoint，
  105 + // 保证支付发放（按订单级）与退款扣减（按订单项）口径一致
  106 + TradePriceCalculatorHelper.recountAllGivePoint(result);
104 107 }
105 108 // 4.2 记录订单是否包邮
106 109 if (Boolean.TRUE.equals(rule.getFreeDelivery())) {
... ...