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

# Conflicts: # firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java # order/src/main/java/com/baiyue/order/controller/InternalOrderCargoController.java # order/src/test/java/com/baiyue/order/controller/InternalOrderCargoControllerTest.java
2026-09-08 17:34:12 +08:00
parent 6c2d169798 442518c382
commit 0a9c798580
35 changed files with 621 additions and 79 deletions
@@ -92,6 +92,8 @@ class InternalOrderCargoControllerTest {
        OrderCargoEntity second = cargo(32L, 2, 2, "50", "30", "20");
        OrderEntity order = new OrderEntity(); order.setId(21L); order.setFulfillmentType("STANDARD");
        when(orders.findOwned(11L, 21L)).thenReturn(order);
+        first.setShipmentId("FBA-SHIPMENT-31");
+        second.setShipmentId("FBA-SHIPMENT-32");
        when(orders.findCargoInheritedByOrder(11L, 21L)).thenReturn(List.of(first, second));

        var response = controller.listForCartonLabels("internal-token", 11L, 21L);
@@ -104,6 +106,8 @@ class InternalOrderCargoControllerTest {
        assertThat(response.data().get(1).unitsPerCarton()).isNull();
        assertThat(response.data().get(0).lengthCm()).isEqualByComparingTo("60");
        verify(orders).findOwned(11L, 21L);
+        assertThat(response.data()).extracting(InternalOrderCargoController.CargoLabelBinding::shipmentId)
+            .containsExactly("FBA-SHIPMENT-31", "FBA-SHIPMENT-32");
        verify(orders).findCargoInheritedByOrder(11L, 21L);
    }