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

# Conflicts: # lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java # lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java
2026-09-09 16:49:46 +08:00
parent 95828a0ec6 17b9f3eb73
commit 48bc8bf0c1
36 changed files with 444 additions and 197 deletions
@@ -134,6 +134,8 @@ class MerchantDeliveryControllerTest {
    private static DeliveryRequests.Transfer transferRequest() {
        return new DeliveryRequests.Transfer("merchant-key", LocalDateTime.now(), "SELF_DELIVERY", null, null,
            "ONE_PICKUP_ONE_DROP", "PALLET", null, null, null, null, null, null, null, null,
-            List.of(new DeliveryRequests.FeeItem("DELIVERY_FEE", "USD", BigDecimal.ZERO, null)));
+            List.of(new DeliveryRequests.FeeItem("DELIVERY_FEE", "派送费", "RECEIVABLE", "CNY",
+                new BigDecimal("10.00"), null, null, null, null, null, null, null, null,
+                null, null, null, null, null, null)));
    }
 }