优化

order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java

@@ -31,11 +31,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import java.util.List;
 
 /**
- * 平台端头程订单管理接口，在明确的目标租户范围内提供查询、审核和履约状态流转能力。
+ * 平台端头程订单管理接口，提供跨租户列表查询，并在明确的目标租户范围内执行详情查询和状态流转。
  */
 @Tag(
     name = "Platform first-leg orders / 平台头程订单",
-    description = "Platform lifecycle management for orders in an explicit target tenant. / 平台端针对明确目标租户管理头程订单生命周期。"
+    description = "Platform review queue across tenants; detail and lifecycle actions require an explicit target tenant. / 平台端跨租户审核队列；详情和生命周期操作需要明确目标租户。"
 )
 @RestController
 @RequestMapping("/api/platform/v1/orders/first-leg")
@@ -98,7 +98,7 @@ public class PlatformFirstLegOrderController {
         return ApiResponse.success(null);
     }
 
-    @Operation(summary = "Tenant order query / 租户订单查询", description = "Queries a page of first-leg orders in the explicit target tenant. / 分页查询明确目标租户下的头程订单。")
+    @Operation(summary = "Platform order query / 平台订单查询", description = "Queries all tenant orders when tenantId is omitted, or filters one tenant when supplied. / tenantId 省略时分页查询全部客户租户订单，传入时仅查询指定租户。")
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "Query succeeded / 查询成功"),
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform scope required / 需要平台端权限")
@@ -107,9 +107,14 @@ public class PlatformFirstLegOrderController {
     @PreAuthorize("hasAuthority('platform:order:list')")
     public ApiResponse<PageResult<OrderEntity>> page(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @Parameter(description = "Target tenant ID / 目标租户 ID", example = "10001", required = true) @RequestParam long tenantId,
+        @Parameter(description = "Optional target tenant filter / 可选的目标租户筛选", example = "10001")
+        @RequestParam(required = false) Long tenantId,
         @Valid OrderRequests.QueryRequest query) {
-        return ApiResponse.success(service.page(OrderScopeGuard.platform(user, tenantId), query));
+        OrderScopeGuard.platform(user);
+        if (tenantId != null) {
+            OrderScopeGuard.platform(user, tenantId);
+        }
+        return ApiResponse.success(service.page(tenantId, query));
     }
 
     @GetMapping("/tenant-counts")

order/src/main/java/com/baiyue/order/repository/OrderRepository.java

@@ -73,9 +73,9 @@ public class OrderRepository {
             .eq(OrderEntity::getId, orderId));
     }
 
-    public PageResult<OrderEntity> page(long tenantId, OrderRequests.QueryRequest query) {
+    public PageResult<OrderEntity> page(Long tenantId, OrderRequests.QueryRequest query) {
         LambdaQueryWrapper<OrderEntity> wrapper = new LambdaQueryWrapper<OrderEntity>()
-            .eq(OrderEntity::getTenantId, tenantId)
+            .eq(tenantId != null, OrderEntity::getTenantId, tenantId)
             .eq(query.status() != null, OrderEntity::getStatus, query.status())
             .eq(query.customerId() != null, OrderEntity::getCustomerId, query.customerId())
             .eq(query.destinationWarehouseId() != null, OrderEntity::getDestinationWarehouseId, query.destinationWarehouseId())

order/src/main/java/com/baiyue/order/service/OrderApplicationService.java

@@ -106,7 +106,7 @@ public class OrderApplicationService {
         completeIdempotency(idempotency, id);
     }
 
-    public PageResult<OrderEntity> page(long tenantId, OrderRequests.QueryRequest query) { return repository.page(tenantId, query); }
+    public PageResult<OrderEntity> page(Long tenantId, OrderRequests.QueryRequest query) { return repository.page(tenantId, query); }
 
     public List<TenantOrderCountResponse> countByTenantIds(List<Long> tenantIds) {
         var counts = repository.countByTenantIds(tenantIds);

order/src/main/java/com/baiyue/order/service/OrderScopeGuard.java

@@ -5,6 +5,7 @@ import com.baiyue.common.core.api.ResultCode; import com.baiyue.common.core.exce
  */
 public final class OrderScopeGuard { private OrderScopeGuard(){}
  public static long merchant(AuthenticatedUser u){requireApp(u,"MERCHANT");if(u.tenantId()==null||u.tenantId()<=0)throw new BizException(ResultCode.FORBIDDEN,"Merchant tenant is required");return u.tenantId();}
+ public static void platform(AuthenticatedUser u){requireApp(u,"PLATFORM");}
  public static long platform(AuthenticatedUser u,long targetTenantId){requireApp(u,"PLATFORM");if(targetTenantId<=0)throw new BizException(ResultCode.BAD_REQUEST,"Target tenant is required");return targetTenantId;}
  private static void requireApp(AuthenticatedUser u,String expected){if(u==null||!expected.equals(u.appCode()))throw new BizException(ResultCode.FORBIDDEN,"Wrong application scope");}
 }

order/src/main/resources/openapi/order-v1.yaml

@@ -27,6 +27,18 @@ paths:
       responses:
         '200': {description: 成功或业务失败，按响应体 code 判断}
   /api/platform/v1/orders/first-leg:
+    get:
+      summary: 平台分页查询头程订单
+      description: tenantId 省略时查询全部客户租户订单，传入时仅查询指定租户。
+      parameters:
+        - name: tenantId
+          in: query
+          required: false
+          description: 可选的目标租户筛选
+          schema: {type: integer, format: int64, minimum: 1}
+      responses:
+        '200': {description: 查询成功或业务失败，按响应体 code 判断}
+        '403': {description: 需要 platform:order:list 权限和平台身份}
     post:
       summary: 平台代客创建订单草稿
       parameters:

order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java

@@ -24,7 +24,7 @@ class OrderControllerPermissionTest {
     @Test
     void platformOrderListAndDetailUseConfiguredListPermission() throws Exception {
         assertAuthority(PlatformFirstLegOrderController.class, "page", "hasAuthority('platform:order:list')",
-            AuthenticatedUser.class, long.class, OrderRequests.QueryRequest.class);
+            AuthenticatedUser.class, Long.class, OrderRequests.QueryRequest.class);
         assertAuthority(PlatformFirstLegOrderController.class, "detail", "hasAuthority('platform:order:list')",
             AuthenticatedUser.class, long.class, long.class);
         assertAuthority(PlatformFirstLegOrderController.class, "tenantCounts", "hasAuthority('platform:order:list')",

order/src/test/java/com/baiyue/order/controller/PlatformOrderPageControllerTest.java

@@ -0,0 +1,72 @@
+package com.baiyue.order.controller;
+
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.order.dto.OrderRequests;
+import com.baiyue.order.service.OrderApplicationService;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+class PlatformOrderPageControllerTest {
+    private final OrderRequests.QueryRequest query = new OrderRequests.QueryRequest(
+        null, null, null, null, null, null, 1, 20);
+
+    @Test
+    void omittedTenantQueriesAcrossAllTenantsForPlatformUser() {
+        OrderApplicationService service = mock(OrderApplicationService.class);
+        PlatformFirstLegOrderController controller = controller(service);
+
+        controller.page(user("PLATFORM"), null, query);
+
+        verify(service).page(null, query);
+    }
+
+    @Test
+    void suppliedTenantFiltersOneTenantForPlatformUser() {
+        OrderApplicationService service = mock(OrderApplicationService.class);
+        PlatformFirstLegOrderController controller = controller(service);
+
+        controller.page(user("PLATFORM"), 2084455952401629185L, query);
+
+        verify(service).page(2084455952401629185L, query);
+    }
+
+    @Test
+    void invalidTenantFilterIsRejectedBeforeQuery() {
+        OrderApplicationService service = mock(OrderApplicationService.class);
+        PlatformFirstLegOrderController controller = controller(service);
+
+        assertThatThrownBy(() -> controller.page(user("PLATFORM"), 0L, query))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("Target tenant is required");
+        verifyNoInteractions(service);
+    }
+
+    @Test
+    void merchantCannotUseCrossTenantPlatformList() {
+        OrderApplicationService service = mock(OrderApplicationService.class);
+        PlatformFirstLegOrderController controller = controller(service);
+
+        assertThatThrownBy(() -> controller.page(user("MERCHANT"), null, query))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("Wrong application scope");
+        verifyNoInteractions(service);
+    }
+
+    private PlatformFirstLegOrderController controller(OrderApplicationService service) {
+        PlatformFirstLegOrderController controller = new PlatformFirstLegOrderController();
+        ReflectionTestUtils.setField(controller, "service", service);
+        return controller;
+    }
+
+    private AuthenticatedUser user(String appCode) {
+        return new AuthenticatedUser(1L, null, null, null, "operator", appCode, "WEB", Set.of());
+    }
+}

order/src/test/java/com/baiyue/order/repository/PlatformOrderPageRepositoryTest.java

@@ -0,0 +1,56 @@
+package com.baiyue.order.repository;
+
+import com.baiyue.order.dto.OrderRequests;
+import com.baiyue.order.entity.OrderEntity;
+import com.baiyue.order.mapper.OrderCargoMapper;
+import com.baiyue.order.mapper.OrderChildPurgeMapper;
+import com.baiyue.order.mapper.OrderIdempotencyRecordMapper;
+import com.baiyue.order.mapper.OrderInternalNoteMapper;
+import com.baiyue.order.mapper.OrderMapper;
+import com.baiyue.order.mapper.OrderPartyMapper;
+import com.baiyue.order.mapper.OrderStatusHistoryMapper;
+import com.baiyue.order.mapper.OutboxEventMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class PlatformOrderPageRepositoryTest {
+    private final OrderRequests.QueryRequest query = new OrderRequests.QueryRequest(
+        null, null, null, null, null, null, 1, 20);
+
+    @Test
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    void tenantPredicateIsAddedOnlyWhenFilterIsSupplied() {
+        OrderMapper mapper = mock(OrderMapper.class);
+        when(mapper.selectPage(any(Page.class), any(Wrapper.class))).thenReturn(new Page<>());
+        OrderRepository repository = repository(mapper);
+
+        repository.page(null, query);
+        repository.page(20002L, query);
+
+        ArgumentCaptor<Wrapper<OrderEntity>> wrapperCaptor = ArgumentCaptor.forClass(Wrapper.class);
+        verify(mapper, org.mockito.Mockito.times(2)).selectPage(any(Page.class), wrapperCaptor.capture());
+        assertThat(wrapperCaptor.getAllValues().get(0).getExpression().getNormal()).isEmpty();
+        assertThat(wrapperCaptor.getAllValues().get(1).getExpression().getNormal()).isNotEmpty();
+    }
+
+    private OrderRepository repository(OrderMapper mapper) {
+        return new OrderRepository(
+            mapper,
+            mock(OrderCargoMapper.class),
+            mock(OrderPartyMapper.class),
+            mock(OrderInternalNoteMapper.class),
+            mock(OrderStatusHistoryMapper.class),
+            mock(OutboxEventMapper.class),
+            mock(OrderChildPurgeMapper.class),
+            mock(OrderIdempotencyRecordMapper.class)
+        );
+    }
+}

order/src/test/java/com/baiyue/order/service/PlatformOrderPageServiceTest.java

@@ -0,0 +1,27 @@
+package com.baiyue.order.service;
+
+import com.baiyue.order.dto.OrderRequests;
+import com.baiyue.order.repository.OrderRepository;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+class PlatformOrderPageServiceTest {
+    private final OrderRequests.QueryRequest query = new OrderRequests.QueryRequest(
+        null, null, null, null, null, null, 1, 20);
+
+    @Test
+    void passesOptionalTenantScopeToRepository() {
+        OrderRepository repository = mock(OrderRepository.class);
+        OrderApplicationService service = new OrderApplicationService();
+        ReflectionTestUtils.setField(service, "repository", repository);
+
+        service.page(null, query);
+        service.page(20002L, query);
+
+        verify(repository).page(null, query);
+        verify(repository).page(20002L, query);
+    }
+}