Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into oy-test

warehouse/src/main/java/com/baiyue/warehouse/controller/PlatformExpressCompanyController.java

@@ -59,6 +59,7 @@ public class PlatformExpressCompanyController {
     @Operation(summary = "分页查询快递公司", description = "按目标租户、关键字和状态分页查询快递公司")
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "查询条件无效"),
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "需要登录"),
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "需要平台快递公司查询权限")
     })

warehouse/src/main/java/com/baiyue/warehouse/controller/PlatformPartnerController.java

@@ -86,6 +86,7 @@ public class PlatformPartnerController {
     @Operation(summary = "分页查询往来单位", description = "按目标租户、关键字、类型和状态分页查询往来单位")
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "查询条件无效"),
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "需要登录"),
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "需要平台往来单位查询权限")
     })

warehouse/src/main/java/com/baiyue/warehouse/controller/PlatformWarehouseController.java

@@ -16,6 +16,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,9 +49,12 @@ public class PlatformWarehouseController {
     )
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "Created successfully / 创建成功"),
-        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform access required / 需要平台端权限"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Invalid request / 请求参数无效"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform warehouse create permission required (platform:warehouse:create) / 需要平台仓库新增权限"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "409", description = "Warehouse code already exists / 仓库编码已存在")
     })
     @PostMapping
+    @PreAuthorize("hasAuthority('platform:warehouse:create')")
     public ApiResponse<Long> create(@AuthenticationPrincipal AuthenticatedUser user,
                                     @Valid @RequestBody WarehouseRequests.SaveRequest request) {
         requirePlatform(user);
@@ -64,9 +68,13 @@ public class PlatformWarehouseController {
     )
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "Updated successfully / 更新成功"),
-        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform access or tenant validation failed / 平台权限或租户校验失败"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Invalid request / 请求参数无效"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform warehouse edit permission required (platform:warehouse:edit), or tenant validation failed / 需要平台仓库编辑权限，或租户校验失败"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "Warehouse not found / 仓库不存在"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "409", description = "Warehouse code already exists / 仓库编码已存在")
     })
     @PutMapping("/{id}")
+    @PreAuthorize("hasAuthority('platform:warehouse:edit')")
     public ApiResponse<Void> update(
         @AuthenticationPrincipal AuthenticatedUser user,
         @Parameter(description = "Target tenant ID / 目标租户 ID", example = "10001", required = true)
@@ -86,9 +94,11 @@ public class PlatformWarehouseController {
     )
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "Query succeeded / 查询成功"),
-        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform access required / 需要平台端权限")
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Invalid query / 查询参数无效"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform warehouse list permission required (platform:warehouse:list) / 需要平台仓库查询权限")
     })
     @GetMapping
+    @PreAuthorize("hasAuthority('platform:warehouse:list')")
     public ApiResponse<PageResult<WarehouseEntity>> page(
         @AuthenticationPrincipal AuthenticatedUser user,
         @Parameter(description = "Target tenant ID / 目标租户 ID", example = "10001", required = true)
@@ -105,9 +115,11 @@ public class PlatformWarehouseController {
     )
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "Query succeeded / 查询成功"),
-        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform access required / 需要平台端权限"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform warehouse list permission required (platform:warehouse:list) / 需要平台仓库查询权限"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "Warehouse not found / 仓库不存在")
     })
     @GetMapping("/{id}")
+    @PreAuthorize("hasAuthority('platform:warehouse:list')")
     public ApiResponse<WarehouseDetailResponse> detail(
         @AuthenticationPrincipal AuthenticatedUser user,
         @Parameter(description = "Target tenant ID / 目标租户 ID", example = "10001", required = true)
@@ -125,9 +137,12 @@ public class PlatformWarehouseController {
     )
     @ApiResponses({
         @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "Status changed / 状态变更成功"),
-        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform access required / 需要平台端权限"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Invalid status / 状态无效"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Platform warehouse status permission required (platform:warehouse:status) / 需要平台仓库启停权限"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "Warehouse not found / 仓库不存在")
     })
     @PatchMapping("/{id}/status")
+    @PreAuthorize("hasAuthority('platform:warehouse:status')")
     public ApiResponse<Void> status(
         @AuthenticationPrincipal AuthenticatedUser user,
         @Parameter(description = "Target tenant ID / 目标租户 ID", example = "10001", required = true)

warehouse/src/main/java/com/baiyue/warehouse/controller/WarehouseDataAccessExceptionHandler.java

@@ -13,7 +13,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-/** 仓储数据库不可用或结构漂移时返回可识别的业务码，并保留完整链路日志。 */
+/** 仓储数据库不可用或结构漂移时返回可识别的 503，并保留完整链路日志。 */
 @Order(Ordered.HIGHEST_PRECEDENCE)
 @RestControllerAdvice(basePackages = "com.baiyue.warehouse.controller")
 public class WarehouseDataAccessExceptionHandler {
@@ -25,7 +25,7 @@ public class WarehouseDataAccessExceptionHandler {
         String traceId = CorrelationContext.traceId(request);
         log.error("Warehouse data access failure requestId={} traceId={}", requestId, traceId, exception);
         ResultCode code = ResultCode.SERVICE_UNAVAILABLE;
-        return ResponseEntity.ok(ApiResponse.failure(code,
+        return ResponseEntity.status(code.httpStatus()).body(ApiResponse.failure(code,
             "仓储数据库暂不可用，请检查数据源和数据库迁移", requestId, traceId));
     }
 }