Commit 2bad3361cc49ab492f53386b5a118c758adfe913
Merge commit '3adaf319f668e38f786dfa679ac627dcc9c25c86' into master-jdk17
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
| @@ -101,6 +101,9 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator | @@ -101,6 +101,9 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator | ||
| 101 | TradePriceCalculateRespBO.OrderItem orderItem = orderItems.get(i); | 101 | TradePriceCalculateRespBO.OrderItem orderItem = orderItems.get(i); |
| 102 | orderItem.setGivePoint(orderItem.getGivePoint() + dividePoints.get(i)); | 102 | orderItem.setGivePoint(orderItem.getGivePoint() + dividePoints.get(i)); |
| 103 | } | 103 | } |
| 104 | + // 订单项赠送积分变化后，同步重算订单级 givePoint， | ||
| 105 | + // 保证支付发放（按订单级）与退款扣减（按订单项）口径一致 | ||
| 106 | + TradePriceCalculatorHelper.recountAllGivePoint(result); | ||
| 104 | } | 107 | } |
| 105 | // 4.2 记录订单是否包邮 | 108 | // 4.2 记录订单是否包邮 |
| 106 | if (Boolean.TRUE.equals(rule.getFreeDelivery())) { | 109 | if (Boolean.TRUE.equals(rule.getFreeDelivery())) { |