提交

lastleg-service/src/test/java/com/baiyue/lastleg/controller/LastlegOrderControllerTest.java

@@ -25,7 +25,7 @@ class LastlegOrderControllerTest {
     private final LastlegOrderService service = mock(LastlegOrderService.class);
     private final LastlegOrderController controller = controller();
     private final LastlegOrderRequests.Query query = new LastlegOrderRequests.Query(
-        1, 20, null, null, null, null, null, null, null, null, null, null);
+        1, 20, null, null, null, null, null, null, null, null, null, null, null, null, null);
 
     @Test
     void platformEndpointRejectsMerchantIdentity() {

lastleg-service/src/test/java/com/baiyue/lastleg/controller/MerchantLastlegOrderControllerTest.java

@@ -18,7 +18,7 @@ class MerchantLastlegOrderControllerTest {
     private final LastlegOrderService service = mock(LastlegOrderService.class);
     private final MerchantLastlegOrderController controller = controller();
     private final LastlegOrderRequests.Query query = new LastlegOrderRequests.Query(
-        1, 20, null, null, null, null, null, null, null, null, null, null);
+        1, 20, null, null, null, null, null, null, null, null, null, null, null, null, null);
 
     @Test
     void merchantListUsesOnlyAuthenticatedTenant() {

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

@@ -17,9 +17,11 @@ class SmartDispatchOpenApiContractTest {
         assertTrue(yaml.contains("/api/platform/v1/last-leg/dispatches/candidates:"));
         assertTrue(yaml.contains("/api/platform/v1/last-leg/dispatches/pre-arrange:"));
         assertTrue(yaml.contains("platform:overseas-warehouse:inbound-order:list"));
-        assertTrue(yaml.contains("platform:overseas-warehouse:inbound-order:edit"));
+        assertTrue(yaml.contains("platform:overseas-warehouse:inbound-order:smart-dispatch"));
         assertTrue(yaml.contains("SmartDispatchPreArrange"));
         assertTrue(yaml.contains("SmartDispatchCandidate"));
+        assertTrue(yaml.contains("name: planIds"));
+        assertTrue(yaml.contains("required: true"));
         String dispatchContract = yaml.substring(0,
             yaml.indexOf("/api/platform/v1/last-leg/overseas-procurements:"));
         assertFalse(dispatchContract.contains("name: customerId"));

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/SmartDispatchControllerTest.java

@@ -31,20 +31,20 @@ class SmartDispatchControllerTest {
     }
 
     @Test
-    void candidatesResolveSingleCustomerScopeWithoutRequestParameter() {
-        when(service.resolveSingleCustomerScope()).thenReturn("100");
-        when(service.candidates("100", "LMO-1", "ONT8", "PLAN")).thenReturn(List.of());
+    void candidatesResolveCustomerScopeFromSelectedPlans() {
+        when(service.resolveCustomerScopeForPlans(List.of(1L, 2L))).thenReturn("100");
+        when(service.candidates("100", List.of(1L, 2L), "LMO-1", "ONT8", "PLAN")).thenReturn(List.of());
 
-        controller.candidates(platform(), "LMO-1", "ONT8", "PLAN");
+        controller.candidates(platform(), List.of(1L, 2L), "LMO-1", "ONT8", "PLAN");
 
-        verify(service).candidates("100", "LMO-1", "ONT8", "PLAN");
+        verify(service).candidates("100", List.of(1L, 2L), "LMO-1", "ONT8", "PLAN");
     }
 
     @Test
     void preArrangeResolvesSingleCustomerAndAuthenticatedOperator() {
         DispatchRequests.PreArrange request = new DispatchRequests.PreArrange(
             List.of(10L, 11L), "ONT8 -> LAX9", "APT-1", "SUCCESS", "PENDING");
-        when(service.resolveSingleCustomerScope()).thenReturn("100");
+        when(service.resolveCustomerScopeForPallets(List.of(10L, 11L))).thenReturn("100");
 
         controller.preArrange(platform(), request);
 
@@ -52,20 +52,20 @@ class SmartDispatchControllerTest {
     }
 
     @Test
-    void endpointsReuseInboundOrderListAndEditAuthorities() throws Exception {
+    void endpointsUseInboundOrderListAndDedicatedSmartDispatchAuthorities() throws Exception {
         PreAuthorize candidates = SmartDispatchController.class
-            .getMethod("candidates", AuthenticatedUser.class, String.class, String.class, String.class)
+            .getMethod("candidates", AuthenticatedUser.class, List.class, String.class, String.class, String.class)
             .getAnnotation(PreAuthorize.class);
         PreAuthorize preArrange = SmartDispatchController.class
             .getMethod("preArrange", AuthenticatedUser.class, DispatchRequests.PreArrange.class)
             .getAnnotation(PreAuthorize.class);
 
         assertThat(candidates.value()).contains(OverseasPermissions.INBOUND_ORDER_LIST);
-        assertThat(preArrange.value()).contains(OverseasPermissions.INBOUND_ORDER_EDIT);
+        assertThat(preArrange.value()).contains(OverseasPermissions.INBOUND_ORDER_SMART_DISPATCH);
     }
 
     private static AuthenticatedUser platform() {
         return new AuthenticatedUser(7L, 0L, 0L, 8L, "operator", "PLATFORM", "WEB",
-            Set.of(OverseasPermissions.INBOUND_ORDER_LIST, OverseasPermissions.INBOUND_ORDER_EDIT));
+            Set.of(OverseasPermissions.INBOUND_ORDER_LIST, OverseasPermissions.INBOUND_ORDER_SMART_DISPATCH));
     }
 }

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

@@ -82,8 +82,28 @@ class DispatchServiceTest {
 
     @Test
     void invalidCandidateStageIsRejected() {
-        assertThrows(ResponseStatusException.class, () -> service.candidates("100", null, null, "INVALID"));
-        verify(candidates, never()).available(any(), any(), any(), any());
+        assertThrows(ResponseStatusException.class,
+            () -> service.candidates("100", List.of(1L), null, null, "INVALID"));
+        verify(candidates, never()).available(any(), any(), any(), any(), any());
+    }
+
+    @Test
+    void resolvesCustomerFromSelectedPlansAndPalletsInMultiCustomerDeployment() {
+        when(candidates.findCustomerScopesByPlanIds(List.of(1L, 2L))).thenReturn(List.of("100"));
+        when(candidates.findCustomerScopesByPlanPalletIds(List.of(10L, 11L))).thenReturn(List.of("100"));
+
+        assertEquals("100", service.resolveCustomerScopeForPlans(List.of(2L, 1L, 1L)));
+        assertEquals("100", service.resolveCustomerScopeForPallets(List.of(11L, 10L)));
+    }
+
+    @Test
+    void rejectsSelectedPlansThatSpanCustomers() {
+        when(candidates.findCustomerScopesByPlanIds(List.of(1L, 2L))).thenReturn(List.of("100", "200"));
+
+        ResponseStatusException exception = assertThrows(ResponseStatusException.class,
+            () -> service.resolveCustomerScopeForPlans(List.of(1L, 2L)));
+
+        assertEquals(409, exception.getStatusCode().value());
     }
 
     @Test
@@ -99,8 +119,8 @@ class DispatchServiceTest {
 
     @Test
     void emptyCustomerScopeProducesEmptyCandidatesAndRejectsPreArrange() {
-        assertEquals(List.of(), service.candidates(null, null, null, null));
-        verify(candidates, never()).available(any(), any(), any(), any());
+        assertEquals(List.of(), service.candidates(null, null, null, null, null));
+        verify(candidates, never()).available(any(), any(), any(), any(), any());
 
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
             () -> service.preArrange(null, "7",

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/controller/InboundPlanPermissionContractTest.java

@@ -13,6 +13,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class InboundPlanPermissionContractTest {
     private static final String LIST = "platform:overseas-warehouse:inbound-order:list";
+    private static final String FBA_APPOINTMENT =
+        "platform:overseas-warehouse:inbound-order:fba-appointment";
 
     @Test
     void listAndDetailUseOnlyCanonicalInboundOrderListAuthority() {
@@ -25,4 +27,18 @@ class InboundPlanPermissionContractTest {
             assertEquals("Required authority: " + LIST, method.getAnnotation(Operation.class).description());
         }
     }
+
+    @Test
+    void fbaAppointmentWritesUseDedicatedAuthority() {
+        Map<String, Method> methods = Arrays.stream(InboundPlanController.class.getDeclaredMethods())
+            .collect(Collectors.toMap(Method::getName, method -> method));
+
+        for (String name : new String[] {"batchFbaAppointment", "updateFbaAppointment"}) {
+            Method method = methods.get(name);
+            assertEquals("hasAuthority('" + FBA_APPOINTMENT + "')",
+                method.getAnnotation(PreAuthorize.class).value());
+            assertEquals("Required authority: " + FBA_APPOINTMENT,
+                method.getAnnotation(Operation.class).description());
+        }
+    }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java

@@ -104,6 +104,23 @@ class LastlegOrderServiceTest {
         verify(orders, never()).updateById(any(LastlegOrder.class));
     }
 
+    @Test
+    void pageUsesPaginationAndPlatformFiltersWithoutCustomerScope() {
+        var query = new LastlegOrderRequests.Query(3, 25, "LL-", "FIRST_LEG", "IN-", null,
+            "", "PENDING_ASSIGNMENT", null, "LAX", null, null, null, null, null);
+        var resultPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<LastlegOrder>(3, 25);
+        resultPage.setTotal(0);
+        when(orders.selectPage(any(), any())).thenReturn(resultPage);
+
+        service.page(null, query);
+
+        ArgumentCaptor<com.baomidou.mybatisplus.extension.plugins.pagination.Page<LastlegOrder>> page =
+            ArgumentCaptor.forClass(com.baomidou.mybatisplus.extension.plugins.pagination.Page.class);
+        verify(orders).selectPage(page.capture(), any());
+        assertEquals(3, page.getValue().getCurrent());
+        assertEquals(25, page.getValue().getSize());
+    }
+
     private static LastlegOrder order(long id, String customerId, String status, String inboundOrderNo) {
         LastlegOrder order = new LastlegOrder();
         order.setId(id);

lastleg-service/src/test/java/com/baiyue/lastleg/service/LoadingCompletedConsumerTest.java

@@ -9,6 +9,25 @@ class LoadingCompletedConsumerTest {
  @Test void sameEventWithDifferentHashIsRejected(){ EventEnvelope event=event(); LastlegEventInbox row=new LastlegEventInbox(); row.setPayloadHash("sha256:"+"0".repeat(64)); when(inbox.selectById(event.eventId())).thenReturn(row); assertThrows(IllegalArgumentException.class,()->service.consume(event)); }
  @Test void rejectsEventFromWrongRegion(){ EventEnvelope source=event(); EventEnvelope invalid=new EventEnvelope(source.eventId(),source.eventType(),source.eventVersion(),source.occurredAt(),RegionCode.OVERSEAS,RegionCode.CN,source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),source.payload(),source.payloadHash()); assertThrows(IllegalArgumentException.class,()->service.consume(invalid)); }
  @Test void consumesFormalDropshipPalletSnapshots(){ var sku=new FirstLegLoadingPlanCompletedV1.SkuPackageSnapshot("SKU-A","Product A",2,20,List.of("BOX-1","BOX-2")); var pallet=new FirstLegLoadingPlanCompletedV1.PalletSnapshot("PLT-1",List.of(sku)); var item=new FirstLegLoadingPlanCompletedV1.Item("d-1","SKU-A","Product A","Product A",2,20,1,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,"wh-1","ONT8","ONT8",null,null,"MARK",null,List.of()); var order=new FirstLegLoadingPlanCompletedV1.Order("in-d","root-d","ord-d","FL-D","root-od","RK-D","wh-1","ONT8","ONT8",2,20,1,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,List.of(item),"100","ONE_CLICK_DROPSHIP",List.of(pallet)); var payload=new FirstLegLoadingPlanCompletedV1("plan-d","LP-D","book-d","CONT-D","CAB-D","92","Warehouse",List.of(order)); JsonNode node=json.valueToTree(payload); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); var event=new EventEnvelope("123e4567-e89b-12d3-a456-426614174010",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN","plan-d",2,1L,"123e4567-e89b-12d3-a456-426614174011","FIRSTLEG_LOADING_COMPLETED:plan-d:100:1",null,node,hash); assertEquals(1,service.consume(event)); ArgumentCaptor<DropshipRequests.Receive> captor=ArgumentCaptor.forClass(DropshipRequests.Receive.class); verify(dropshipOrders).receive(captor.capture()); assertEquals("100",captor.getValue().customerId()); assertEquals(1,captor.getValue().pallets().size()); assertEquals("PLT-1",captor.getValue().pallets().get(0).palletNo()); assertEquals(List.of("BOX-1","BOX-2"),captor.getValue().pallets().get(0).skuPackages().get(0).cartonMarks()); }
+ @Test void oneDropshipInboundWithMultipleSkusCreatesOneOrderAndMultipleSkuDetails(){
+  var itemA=new FirstLegLoadingPlanCompletedV1.Item("d-a","SKU-A","产品A","Product A",2,20,1,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,"wh-1","ONT8","ONT8",null,"SHIP-A","MARK-A",null,List.of("BOX-A1","BOX-A2"));
+  var itemB=new FirstLegLoadingPlanCompletedV1.Item("d-b","SKU-B","产品B","Product B",3,15,1,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,"wh-1","ONT8","ONT8",null,"SHIP-B","MARK-B",null,List.of("BOX-B1","BOX-B2","BOX-B3"));
+  var pallet=new FirstLegLoadingPlanCompletedV1.PalletSnapshot("PLT-1",List.of(
+      new FirstLegLoadingPlanCompletedV1.SkuPackageSnapshot("SKU-A","产品A",2,20,List.of("BOX-A1","BOX-A2")),
+      new FirstLegLoadingPlanCompletedV1.SkuPackageSnapshot("SKU-B","产品B",3,15,List.of("BOX-B1","BOX-B2","BOX-B3"))));
+  var order=new FirstLegLoadingPlanCompletedV1.Order("in-multi","root-multi","ord-multi","FL-MULTI","root-ord-multi","RK-MULTI","wh-1","ONT8","ONT8",5,35,1,BigDecimal.valueOf(2),BigDecimal.valueOf(2),BigDecimal.valueOf(2),List.of(itemA,itemB),"100","ONE_CLICK_DROPSHIP",List.of(pallet));
+  EventEnvelope event=eventForPayload(new FirstLegLoadingPlanCompletedV1("plan-multi","LP-MULTI","book-multi","CONT-MULTI","CAB-MULTI","92","Warehouse",List.of(order)),2);
+
+  assertEquals(1,service.consume(event));
+  verify(orders,times(1)).insert(any(LastlegOrder.class));
+  ArgumentCaptor<LastlegOrderDetail> detailCaptor=ArgumentCaptor.forClass(LastlegOrderDetail.class);
+  verify(details,times(2)).insert(detailCaptor.capture());
+  assertEquals(Map.of("SKU-A",2,"SKU-B",3),detailCaptor.getAllValues().stream().collect(java.util.stream.Collectors.toMap(LastlegOrderDetail::getSkuCode,LastlegOrderDetail::getPackageCount)));
+  ArgumentCaptor<DropshipRequests.Receive> receiveCaptor=ArgumentCaptor.forClass(DropshipRequests.Receive.class);
+  verify(dropshipOrders).receive(receiveCaptor.capture());
+  assertEquals(2,receiveCaptor.getValue().pallets().get(0).skuPackages().size());
+  assertEquals(Map.of("SKU-A",2L,"SKU-B",3L),receiveCaptor.getValue().pallets().get(0).skuPackages().stream().collect(java.util.stream.Collectors.toMap(DropshipRequests.SkuPackages::skuCode,DropshipRequests.SkuPackages::packageCount)));
+ }
  @Test void consumesV2LoadingEventAndKeepsDropshipSnapshot(){
  EventEnvelope source=event();
   JsonNode node=source.payload().deepCopy();
@@ -40,4 +59,5 @@ class LoadingCompletedConsumerTest {
   verify(orders,never()).insert(any(LastlegOrder.class));
  }
  private EventEnvelope event(){ var item1=new FirstLegLoadingPlanCompletedV1.Item("d-1","SKU-1","产品","Product",5,50,1,new BigDecimal("10"),new BigDecimal("9"),new BigDecimal("12"),new BigDecimal("1.2"),"wh-1","ONT8","FBA ONT8","FBA-1","SHIP-1","MARK-1"); var item2=new FirstLegLoadingPlanCompletedV1.Item("d-2","SKU-2","产品2","Product2",3,30,2,new BigDecimal("8"),new BigDecimal("7"),new BigDecimal("9"),new BigDecimal("0.8"),"wh-2","LAX9","FBA LAX9","FBA-2","SHIP-2","MARK-2"); var p=new FirstLegLoadingPlanCompletedV1("plan-1","LP1","book-1","MSCU1","CAB1","ow-1","洛杉矶海外仓",List.of(new FirstLegLoadingPlanCompletedV1.Order("in-1","root-1","ord-1","FL1","root-o1","RK1","wh-1","ONT8","FBA ONT8",5,50,1,new BigDecimal("10"),new BigDecimal("9"),new BigDecimal("1.2"),List.of(item1)),new FirstLegLoadingPlanCompletedV1.Order("in-2","root-2","ord-2","FL2","root-o2","RK2","wh-2","LAX9","FBA LAX9",3,30,2,new BigDecimal("8"),new BigDecimal("7"),new BigDecimal("0.8"),List.of(item2)))); JsonNode node=json.valueToTree(p); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); return new EventEnvelope("123e4567-e89b-12d3-a456-426614174000",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN","plan-1",2,1L,"123e4567-e89b-12d3-a456-426614174001","FIRSTLEG_LOADING_COMPLETED:plan-1:100:1",null,node,hash); }
+ private EventEnvelope eventForPayload(FirstLegLoadingPlanCompletedV1 payload, long version){ JsonNode node=json.valueToTree(payload); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); return new EventEnvelope("123e4567-e89b-12d3-a456-426614174099",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN",payload.loadingPlanId(),2,version,"123e4567-e89b-12d3-a456-426614174098","FIRSTLEG_LOADING_COMPLETED:"+payload.loadingPlanId()+":100:1",null,node,hash); }
 }