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

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/PlatformDispatchOutboundContractTest.java

@@ -213,7 +213,7 @@ class PlatformDispatchOutboundContractTest {
             "  /api/platform/v1/last-leg/outbound-orders/{outboundNo}/cancel:");
         String outboundCancel = slice(yaml,
             "  /api/platform/v1/last-leg/outbound-orders/{outboundNo}/cancel:",
-            "  /api/platform/v1/last-leg/overseas-procurements:");
+            "  /api/platform/v1/last-leg/delivery-orders:");
 
         for (String action : Set.of(dispatchAction, outboundDetail, outboundCancel)) {
             assertFalse(action.contains("name: customerId"));

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchRepairWorkflowTest.java

@@ -109,6 +109,7 @@ class DispatchRepairWorkflowTest {
         db.execute("CREATE TABLE IF NOT EXISTS ll_inbound_plan(id BIGINT,customer_id VARCHAR(64),overseas_warehouse_id VARCHAR(64),source_order_id BIGINT)");
         db.execute("CREATE TABLE IF NOT EXISTS ll_inbound_plan_pallet(id BIGINT,customer_id VARCHAR(128) NOT NULL,plan_id BIGINT,pallet_no VARCHAR(128),warehouse_pallet_id BIGINT)");
         db.execute("CREATE TABLE IF NOT EXISTS ll_physical_pallet_guard(warehouse_pallet_id BIGINT PRIMARY KEY,created_at TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3))");
+        db.execute("CREATE TABLE IF NOT EXISTS ll_cargo_discard_carton(customer_id VARCHAR(128),carton_id BIGINT,source_type VARCHAR(32))");
         for(var column:List.of("order_id BIGINT","warehouse_pallet_id BIGINT","inventory_position_id BIGINT","received_packages BIGINT"))db.execute("ALTER TABLE ll_inbound_stock_receipt ADD COLUMN IF NOT EXISTS "+column);
         candidates=spy(session.getMapper(DispatchCandidateMapper.class));doReturn(List.of()).when(candidates).nativeReturnRelabelAvailable(any(),any(),any());dependencies.put(DispatchCandidateMapper.class,candidates);
         dependencies.put(ObjectMapper.class,json);dependencies.put(LastlegOrderNoGenerator.class,com.baiyue.lastleg.service.TestDocumentNumbers.orders());
@@ -353,7 +354,7 @@ class DispatchRepairWorkflowTest {
     /** 准备统一未拣货排车、出库及派送关系，避免用桩伪造取消资格。 */
     private void seedPendingOutbound() {
         var shell=inTransaction(()->aggregateFixture.fleet.createDispatchShell("OP",new FleetExecutionModels.DispatchShellRequest(1,"DP-1",9,"seed-physical-trip","b".repeat(64),null,null,null,null)));
-        db.update("INSERT INTO ll_dispatch_order(id,dispatch_no,trip_id,overseas_warehouse_id,status,stage,record_version,cargo_revision,cargo_hash,review_state,review_round,dispatch_review_json,loading_review_json,resources_json,item_count,pallet_count,package_count,picked_package_count,shipped_package_count) VALUES(1,'DP-1',?,'9','ACTIVE','BEFORE_LOADING',0,0,?,'DRAFT',0,?,?,?,1,1,2,0,0)",shell.tripId(),"c".repeat(64),"{\"status\":\"NOT_SUBMITTED\",\"reviewRound\":0}","{\"status\":\"NOT_SUBMITTED\",\"reviewRound\":0}","{\"vehicle\":null,\"driver\":null}");
+        db.update("INSERT INTO ll_dispatch_order(id,dispatch_no,trip_id,overseas_warehouse_id,task_type,status,stage,record_version,cargo_revision,cargo_hash,review_state,review_round,dispatch_review_json,loading_review_json,resources_json,item_count,pallet_count,package_count,picked_package_count,shipped_package_count) VALUES(1,'DP-1',?,'9','DELIVERY','ACTIVE','BEFORE_LOADING',0,0,?,'DRAFT',0,?,?,?,1,1,2,0,0)",shell.tripId(),"c".repeat(64),"{\"status\":\"NOT_SUBMITTED\",\"reviewRound\":0}","{\"status\":\"NOT_SUBMITTED\",\"reviewRound\":0}","{\"vehicle\":null,\"driver\":null}");
         run(()->aggregateFixture.fleet.linkDispatchShell("OP",1,"DP-1",shell.tripNo()));
         db.update("UPDATE ll_fleet_trip_dispatch SET package_count=2 WHERE dispatch_id=1");
         db.update("INSERT INTO ll_outbound_order(id,customer_id,outbound_no,dispatch_order_id,dispatch_no,outbound_type,status,package_count,pallet_count) VALUES(2,'101','OUT-1',1,'DP-1','DISPATCH_OUTBOUND','WAIT_OUTBOUND',2,1)");

lastleg-service/src/test/java/com/baiyue/lastleg/procurement/OverseasProcurementOpenApiContractTest.java

@@ -31,7 +31,7 @@ class OverseasProcurementOpenApiContractTest {
                 "merchant:cross-border:procurement:list", "merchant:cross-border:procurement:create"}) {
             assertTrue(yaml.contains(permission), permission);
         }
-        assertTrue(yaml.contains("enum: [PENDING_REVIEW, RECEIVING, WAIT_CUSTOMER_CONFIRM, CONFIRMED, IN_TRANSIT, DELIVERING, COMPLETED]"));
+        assertTrue(yaml.contains("enum: [FUNDING_PENDING, FUNDING_FAILED, PENDING_REVIEW, RECEIVING, WAIT_CUSTOMER_CONFIRM, CONFIRMED, IN_TRANSIT, DELIVERING, COMPLETED]"));
         assertTrue(yaml.contains("required: [version, idempotencyKey]"));
         assertTrue(yaml.contains("required: [quantity, trackingNo]"));
         assertTrue(yaml.contains("required: [quantity, fileIds]"));
@@ -77,7 +77,7 @@ class OverseasProcurementOpenApiContractTest {
         assertTrue(yaml.contains("/{orderNo}/dispatch:"));
         assertTrue(yaml.contains("/{orderNo}/start-transit:"));
         assertTrue(yaml.contains("/{orderNo}/complete:"));
-        assertTrue(yaml.contains("enum: [PENDING_REVIEW, WAITING_INBOUND, RECEIVING, WAITING_CONSOLIDATION, PALLET_OVERAGE_REVIEW, PARTIALLY_ALLOCATED, ALLOCATED, PENDING_DISPATCH, DISPATCHED, IN_TRANSIT, COMPLETED, REJECTED, CANCELLED]"));
+        assertTrue(yaml.contains("enum: [FUNDING_PENDING, FUNDING_FAILED, PENDING_REVIEW, WAITING_INBOUND, RECEIVING, WAITING_CONSOLIDATION, PALLET_OVERAGE_REVIEW, PARTIALLY_ALLOCATED, ALLOCATED, PENDING_DISPATCH, DISPATCHED, IN_TRANSIT, COMPLETED, REJECTED, CANCELLED]"));
         assertTrue(yaml.contains("required: [version, status, idempotencyKey]"));
         assertTrue(yaml.contains("/api/platform/v1/last-leg/local-looseboard-orders:"));
         assertTrue(yaml.contains("platform:overseas-business:looseboard:list"));

lastleg-service/src/test/java/com/baiyue/lastleg/transfer/service/WarehouseTransferCartonCountTest.java

@@ -3,6 +3,7 @@ package com.baiyue.lastleg.transfer.service;
 import com.baiyue.lastleg.transfer.dto.WarehouseTransferRequests;
 import com.baiyue.lastleg.transfer.entity.*;
 import com.baiyue.lastleg.transfer.mapper.*;
+import com.baiyue.lastleg.transfer.looseboard.LooseboardPlannedCargoService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -27,6 +28,7 @@ class WarehouseTransferCartonCountTest {
         service = spy(new WarehouseTransferService());
         org.springframework.test.util.ReflectionTestUtils.setField(service, "storageRent", org.mockito.Mockito.mock(com.baiyue.lastleg.storagerent.service.StorageRentService.class));
         ReflectionTestUtils.setField(service, "transfers", orders);
+        ReflectionTestUtils.setField(service, "looseboardPlannedCargo", mock(LooseboardPlannedCargoService.class));
         var pickupRepository = org.mockito.Mockito.mock(com.baiyue.lastleg.fleet.pickup.FleetPickupRepository.class);
         ReflectionTestUtils.setField(service, "pickupService", new com.baiyue.lastleg.fleet.pickup.FleetPickupService(pickupRepository,null,null,null,null,null,new ObjectMapper(),mock(com.baiyue.lastleg.fleet.pickup.PickupDepartureReview.class)));
         ReflectionTestUtils.setField(service, "transferCartons", cartons);