Merge commit '3adaf319f668e38f786dfa679ac627dcc9c25c86' into master-jdk17

YunaiV
2 parents 04515204 3adaf319
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 
                 TradePriceCalculateRespBO.OrderItem orderItem = orderItems.get(i);
                 orderItem.setGivePoint(orderItem.getGivePoint() + dividePoints.get(i));
             }
+            // 订单项赠送积分变化后，同步重算订单级 givePoint，
+            // 保证支付发放（按订单级）与退款扣减（按订单项）口径一致
+            TradePriceCalculatorHelper.recountAllGivePoint(result);
         }
         // 4.2 记录订单是否包邮
         if (Boolean.TRUE.equals(rule.getFreeDelivery())) {