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

# Conflicts: # firstleg/src/test/java/com/baiyue/firstleg/service/CartonMeasurementServiceTest.java
2026-09-03 21:23:35 +08:00
parent 0ad8bb66cc baabfdabba
commit 1a3f94dfcb
38 changed files with 643 additions and 206 deletions
@@ -167,6 +167,25 @@ class UnifiedOrderQueryServiceTest {
            .extracting(UnifiedOrderResponse.Row::totalPackageCount).isEqualTo(35);
    }

+    @Test
+    void regularOrderAlwaysDisplaysDeclaredCargoCountInsteadOfMeasuredInboundSnapshot() {
+        UnifiedOrderQuery query = query(null);
+        OrderEntity order = order(OrderStatus.APPROVED);
+        OrderCargoEntity declaredCargo = new OrderCargoEntity();
+        declaredCargo.setOrderId(77L);
+        declaredCargo.setPackageCount(100);
+        var summary = summary("WAIT_SPLIT", null);
+        when(summary.inbound().totalPackageCount()).thenReturn(3);
+        when(orders.unifiedPage(eq(10001L), eq(query), any()))
+            .thenReturn(new PageResult<>(List.of(order), 1, 20, 1, 1));
+        when(firstleg.summaries(eq("internal-token"), any()))
+            .thenReturn(ApiResponse.success(List.of(summary)));
+        when(orders.findCargoByOrderIds(10001L, List.of(77L))).thenReturn(List.of(declaredCargo));
+
+        assertThat(service.page(10001L, query).records()).singleElement()
+            .extracting(UnifiedOrderResponse.Row::totalPackageCount).isEqualTo(100);
+    }
+
    @Test
    void inboundMasterUsesTotalPackageCountEvenWhenLegacyPackageCountIsAbsent() {
        UnifiedOrderQuery query = query(null);