提交

warehouse-overseas-service/src/main/java/com/baiyue/warehouse/controller/PlatformWarehouseController.java

@@ -90,8 +90,8 @@ public class PlatformWarehouseController {
     }
 
     @Operation(
-        summary = "List tenant warehouses / 查询租户仓库",
-        description = "Required authority: " + OverseasWarehousePermissions.WAREHOUSE_LIST + ". Returns a customer-scoped warehouse page with optional filters."
+        summary = "List warehouses / 查询仓库",
+        description = "Required authority: " + OverseasWarehousePermissions.WAREHOUSE_LIST + ". Returns all warehouses with optional filters."
     )
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "Query succeeded / 查询成功"),
@@ -102,12 +102,9 @@ public class PlatformWarehouseController {
     @PreAuthorize("hasAuthority('" + OverseasWarehousePermissions.WAREHOUSE_LIST + "')")
     public ApiResponse<PageResult<WarehouseEntity>> page(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @Parameter(description = "Target tenant ID / 目标租户 ID", example = "10001", required = true)
-        @RequestParam @NotNull Long customerId,
         @Valid WarehouseRequests.QueryRequest request) {
         requirePlatform(user);
-        requireTenant(customerId);
-        return ApiResponse.success(service.page(customerId, request));
+        return ApiResponse.success(service.pageAll(request));
     }
 
     @Operation(

warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseRepository.java

@@ -85,6 +85,29 @@ public class WarehouseRepository {
         return PageResult.from(warehouses.selectPage(new Page<>(query.page(), query.size()), wrapper));
     }
 
+    public PageResult<WarehouseEntity> pageAll(WarehouseRequests.QueryRequest query) {
+        LambdaQueryWrapper<WarehouseEntity> wrapper = new LambdaQueryWrapper<WarehouseEntity>()
+            .eq(StringUtils.hasText(query.status()), WarehouseEntity::getStatus, query.status())
+            .eq(StringUtils.hasText(query.countryCode()), WarehouseEntity::getCountryCode, query.countryCode())
+            .orderByDesc(WarehouseEntity::getCreatedAt);
+
+        if (StringUtils.hasText(query.capabilityCode())) {
+            List<Long> ids = capabilities.selectList(new LambdaQueryWrapper<ServiceCapabilityEntity>()
+                    .select(ServiceCapabilityEntity::getWarehouseId)
+                    .eq(ServiceCapabilityEntity::getCapabilityCode, query.capabilityCode())
+                    .eq(ServiceCapabilityEntity::getEnabled, true))
+                .stream()
+                .map(ServiceCapabilityEntity::getWarehouseId)
+                .distinct()
+                .toList();
+            if (ids.isEmpty()) {
+                return new PageResult<>(List.of(), query.page(), query.size(), 0, 0);
+            }
+            wrapper.in(WarehouseEntity::getId, ids);
+        }
+        return PageResult.from(warehouses.selectPage(new Page<>(query.page(), query.size()), wrapper));
+    }
+
     public List<WarehouseAddressEntity> findAddresses(long customerId, long warehouseId) {
         return addresses.selectList(new LambdaQueryWrapper<WarehouseAddressEntity>()
             .eq(WarehouseAddressEntity::getCustomerId, customerId)

warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java

@@ -87,6 +87,10 @@ public class WarehouseApplicationService {
         return repository.page(customerId, query);
     }
 
+    public PageResult<WarehouseEntity> pageAll(WarehouseRequests.QueryRequest query) {
+        return repository.pageAll(query);
+    }
+
     public WarehouseDetailResponse detail(long customerId, long id) {
         WarehouseEntity warehouse = owned(customerId, id);
         List<WarehouseAddressEntity> addresses = repository.findAddresses(customerId, id);