优化

firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingCandidateMapperContractTest.java

@@ -13,7 +13,7 @@ class SmartLoadingCandidateMapperContractTest {
     @Test
     void candidateHasOnlyTheCanonicalMybatisConstructor() {
         assertThat(Candidate.class.getDeclaredConstructors()).singleElement()
-            .satisfies(constructor -> assertThat(constructor.getParameterCount()).isEqualTo(24));
+            .satisfies(constructor -> assertThat(constructor.getParameterCount()).isEqualTo(26));
     }
 
     @Test
@@ -23,6 +23,8 @@ class SmartLoadingCandidateMapperContractTest {
 
         assertThat(sql)
             .contains("o.destination_warehouse_id destinationWarehouseId")
+            .contains("o.order_status_snapshot orderStatusSnapshot")
+            .contains("o.expected_arrival_at expectedArrivalAt")
             .contains("m.status='APPROVED'")
             .contains("SELECT MAX(m2.id)")
             .contains("m2.status='APPROVED'")
@@ -51,6 +53,8 @@ class SmartLoadingCandidateMapperContractTest {
 
         assertThat(sql)
             .contains("o.destination_warehouse_id destinationWarehouseId")
+            .contains("o.order_status_snapshot orderStatusSnapshot")
+            .contains("o.expected_arrival_at expectedArrivalAt")
             .contains("m.status='APPROVED'")
             .contains("SELECT MAX(m2.id)")
             .contains("o.warehouse_id=#{warehouseId}")

firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java

@@ -122,11 +122,11 @@ class SmartLoadingServiceTest {
         Candidate first = new Candidate(9L, 10L, 20L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "服装", 3,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.2"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, "WAIT_SPLIT", LocalDateTime.parse("2026-09-10T09:30:00"));
         Candidate second = new Candidate(9L, 10L, 21L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "鞋类", 7,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.5"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, "WAIT_SPLIT", LocalDateTime.parse("2026-09-10T09:30:00"));
         when(repository.booking(99L)).thenReturn(booking());
         when(repository.candidates(100L)).thenReturn(List.of(first, second));
 
@@ -139,6 +139,8 @@ class SmartLoadingServiceTest {
             assertThat(candidate.averageUnitVolumeCbm()).isEqualByComparingTo("0.410000");
             assertThat(candidate.availableVolumeCbm()).isEqualByComparingTo("4.1000");
             assertThat(candidate.unitGrossWeightKg()).isEqualByComparingTo("2");
+            assertThat(candidate.orderStatusSnapshot()).isEqualTo("WAIT_SPLIT");
+            assertThat(candidate.expectedArrivalAt()).isEqualTo(LocalDateTime.parse("2026-09-10T09:30:00"));
         });
     }
 
@@ -440,15 +442,15 @@ class SmartLoadingServiceTest {
         Candidate first = new Candidate(9L, 10L, 20L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "A", 30,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.2"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, null, null);
         Candidate second = new Candidate(9L, 10L, 21L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "B", 40,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.5"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, null, null);
         Candidate third = new Candidate(9L, 10L, 22L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "C", 30,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.8"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, null, null);
 
         var result = service.proportionalAllocations(List.of(first, second, third), 60);
 
@@ -1109,7 +1111,7 @@ class SmartLoadingServiceTest {
         return new Candidate(tenantId, inboundId, detailId, orderId, "O" + orderId, "I" + inboundId,
             100L, "FBA", "FBA渠道", 200L, destinationCode, "FBA仓", "客户", "货物", boxes,
             new BigDecimal("2"), new BigDecimal("1.5"),
-            new BigDecimal("0.5"), null, null, null, null, null, null);
+            new BigDecimal("0.5"), null, null, null, null, null, null, null, null);
     }
 
     private static Candidate withChannel(Candidate value, String channelCode, String channelName) {
@@ -1118,7 +1120,8 @@ class SmartLoadingServiceTest {
             value.destinationWarehouseId(), value.destinationWarehouseCode(), value.destinationWarehouseName(),
             value.customerName(), value.goodsName(), value.availablePackageCount(), value.unitGrossWeightKg(),
             value.unitNetWeightKg(), value.unitVolumeCbm(), value.coLoadGroupId(), value.groupNo(),
-            value.memberCount(), value.groupTotalBoxes(), value.locked(), value.blockReason());
+            value.memberCount(), value.groupTotalBoxes(), value.locked(), value.blockReason(),
+            value.orderStatusSnapshot(), value.expectedArrivalAt());
     }
 
     private static ChannelRow channel(String channelCode, String channelName) {