BJ_ZTEITS-Developers / parking-cloud-yudao

Commit baa9adbbb1ad864da287d6debb02c4e542045b1a

Authored by YunaiV
1 parent 2bad3361

test(trade): 补充满减送订单赠送积分断言 

- 在现有满减送用例中校验订单总赠送积分，防止支付发放与退款扣减口径不一致
- 精简赠送积分汇总注释，对齐相邻计算器代码风格

关联 PR: #1264
关联 issue: #1263
Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
  View file @baa9adb
@@ -101,8 +101,7 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator @@ -101,8 +101,7 @@ 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 - // 保证支付发放（按订单级）与退款扣减（按订单项）口径一致 104 + // 更新订单赠送积分
106 TradePriceCalculatorHelper.recountAllGivePoint(result); 105 TradePriceCalculatorHelper.recountAllGivePoint(result);
107 } 106 }
108 // 4.2 记录订单是否包邮 107 // 4.2 记录订单是否包邮
yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java
  View file @baa9adb
@@ -85,6 +85,8 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest @@ -85,6 +85,8 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest
85 assertEquals(price.getPayPrice(), 420); 85 assertEquals(price.getPayPrice(), 420);
86 // 断言：包邮标记 86 // 断言：包邮标记
87 assertTrue(result.getFreeDelivery()); 87 assertTrue(result.getFreeDelivery());
  88 + // 断言：赠送积分
  89 + assertEquals(result.getGivePoint(), 100);
88 90
89 // 断言：SKU 1 优惠 50 * 200/350 = 28 91 // 断言：SKU 1 优惠 50 * 200/350 = 28
90 TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0); 92 TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0);