优化

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

@@ -10,6 +10,8 @@ import com.baiyue.firstleg.mapper.LoadingCompletedEventMapper.PalletRow;
 import com.baiyue.firstleg.mapper.LoadingCartonManifestMapper;
 import com.baiyue.firstleg.mapper.LoadingCartonManifestMapper.LabelRow;
 import com.baiyue.firstleg.mapper.LoadingPalletLabelMapper;
+import com.baiyue.firstleg.loading.mapper.CabinetLoadingEvidenceMapper;
+import com.baiyue.firstleg.loading.entity.CabinetLoadingEvidenceEntity;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +35,7 @@ class LoadingCompletedOutboxServiceTest {
     private final LoadingCartonManifestMapper manifests = mock(LoadingCartonManifestMapper.class);
     private final LoadingPalletLabelMapper palletLabels = mock(LoadingPalletLabelMapper.class);
     private final LoadingPalletLabelService palletLabelService = mock(LoadingPalletLabelService.class);
+    private final CabinetLoadingEvidenceMapper cabinetEvidence = mock(CabinetLoadingEvidenceMapper.class);
     private final ObjectMapper mapper = new ObjectMapper().findAndRegisterModules();
     private final LoadingCompletedOutboxService service = new LoadingCompletedOutboxService();
 
@@ -41,14 +44,25 @@ class LoadingCompletedOutboxServiceTest {
         ReflectionTestUtils.setField(service,"cartonManifestMapper",manifests);
         ReflectionTestUtils.setField(service,"palletLabelMapper",palletLabels);
         ReflectionTestUtils.setField(service,"palletLabelService",palletLabelService);
+        ReflectionTestUtils.setField(service,"cabinetEvidenceMapper",cabinetEvidence);
         ReflectionTestUtils.setField(service,"outboxMapper",outbox);
         ReflectionTestUtils.setField(service,"objectMapper",mapper);
         when(palletLabels.labels(anyLong())).thenReturn(List.of());
+        when(cabinetEvidence.byContainer(anyLong())).thenReturn(List.of(
+            evidence("PHOTO_STEP_1", 1), evidence("PHOTO_STEP_2", 2), evidence("PHOTO_STEP_3", 3),
+            evidence("PHOTO_STEP_4", 4), evidence("SEAL", 5)));
         when(manifests.labelPool(anyLong(), anyLong())).thenAnswer(invocation -> List.of(
             label(101, "BOX-101"), label(102, "BOX-102"),
             label(202, "BOX-202"), label(302, "BOX-302")));
     }
 
+    private static CabinetLoadingEvidenceEntity evidence(String type, long fileId) {
+        CabinetLoadingEvidenceEntity value = new CabinetLoadingEvidenceEntity();
+        value.setEvidenceType(type); value.setFileId(fileId); value.setFileName(type + ".jpg");
+        value.setStatus("ACTIVE"); value.setActiveFlag(1);
+        return value;
+    }
+
     @Test void groupsByAccountAndKeepsAllOrdersAndItemsStable() throws Exception {
         when(snapshots.rows(90L)).thenReturn(List.of(row(22,300,302),row(11,200,202),row(11,100,102),row(11,100,101)));
         when(snapshots.palletRows(90L)).thenReturn(List.of(
@@ -79,9 +93,12 @@ class LoadingCompletedOutboxServiceTest {
         assertThat(first.payload().at("/actualPortArrivalAt").asText()).isEqualTo("2026-10-01T08:30");
         assertThat(first.payload().at("/estimatedWarehouseArrivalAt").asText()).isEqualTo("2026-10-03T09:00");
         assertThat(first.payload().at("/sourceContainerBookingId").asText()).isEqualTo("91");
+        assertThat(first.payload().get("loadingEvidence")).hasSize(5);
+        assertThat(first.payload().at("/loadingEvidence/0/evidenceType").asText()).isEqualTo("PHOTO_STEP_1");
+        assertThat(first.payload().at("/loadingEvidence/4/evidenceType").asText()).isEqualTo("SEAL");
         assertThat(first.payload().has("containerBookingId")).isFalse();
-        assertThat(rows.get(0).getEventKey()).isEqualTo("FIRSTLEG_LOADING_COMPLETED:90:11:2");
-        assertThat(first.eventVersion()).isEqualTo(2);
+        assertThat(rows.get(0).getEventKey()).isEqualTo("FIRSTLEG_LOADING_COMPLETED:90:11:3");
+        assertThat(first.eventVersion()).isEqualTo(3);
     }
 
     @Test void requiresFrozenPhysicalContainerNumberBeforePublishing() {

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

@@ -39,7 +39,7 @@ class TaillegRealProducerAcceptanceTest {
 
     @Test
     void completedLoadingPlanPublishesFirstLegAndDropshipOrders() {
-        String eventKey = "FIRSTLEG_LOADING_COMPLETED:" + PLAN + ":" + CUSTOMER + ":2";
+        String eventKey = "FIRSTLEG_LOADING_COMPLETED:" + PLAN + ":" + CUSTOMER + ":3";
         Integer existing = jdbc.queryForObject("SELECT COUNT(*) FROM fl_inbound_outbox WHERE event_key=?",
             Integer.class, eventKey);
         if (existing == 0) {
@@ -51,6 +51,8 @@ class TaillegRealProducerAcceptanceTest {
         assertEquals(2, jdbc.queryForObject("SELECT JSON_LENGTH(JSON_EXTRACT(payload_json,'$.payload.orders')) " +
             "FROM fl_inbound_outbox WHERE event_key=?", Integer.class,
             eventKey));
+        assertEquals(5, jdbc.queryForObject("SELECT JSON_LENGTH(JSON_EXTRACT(payload_json,'$.payload.loadingEvidence')) " +
+            "FROM fl_inbound_outbox WHERE event_key=?", Integer.class, eventKey));
         assertEquals("真实验收客户", jdbc.queryForObject(
             "SELECT JSON_UNQUOTE(JSON_EXTRACT(payload_json,'$.payload.orders[0].customerName')) " +
                 "FROM fl_inbound_outbox WHERE event_key=?", String.class, eventKey));
@@ -91,6 +93,15 @@ class TaillegRealProducerAcceptanceTest {
             990022901L, PLAN, BOOKING, MARKER + "-CAB", MARKER + "-CNTR");
         seedPickItem(990022911L, 990022321L, FIRST_INBOUND, 990022421L, 3);
         seedPickItem(990022912L, 990022322L, DROPSHIP_INBOUND, 990022422L, 2);
+        int evidenceIndex = 0;
+        for (String type : new String[] {"PHOTO_STEP_1", "PHOTO_STEP_2", "PHOTO_STEP_3", "PHOTO_STEP_4", "SEAL"}) {
+            long id = 990023000L + evidenceIndex;
+            jdbc.update("INSERT IGNORE INTO fl_loading_cabinet_evidence(id,container_booking_id,source_task_id," +
+                    "evidence_type,file_id,file_name,status,active_flag,operation_key,request_hash,created_by,updated_by) " +
+                    "VALUES(?,?,?,?,?,?,'ACTIVE',1,?,REPEAT('a',64),1,1)",
+                id, BOOKING, 990022901L, type, id + 1000, type + ".jpg", MARKER + "-EVIDENCE-" + type);
+            evidenceIndex++;
+        }
         jdbc.update("UPDATE fl_loading_plan SET plan_status='COMPLETED',confirmed_at=NOW(3),version=version+1 WHERE id=?", PLAN);
     }