Parcourir la source

feat(admin): S-cfc-317 admin.order.manual 权限流 GREEN——订单/售后端点补 B-142-1 admin 角色守卫(TR-13)

- AdminProductOrderController:/list 平台角色+纯供应商(B-5)放行、其余 403;
  detail/ship/update-express/close/refund(approve|reject) 仅 admin,非 admin -> 403「无权限」且不触达 service
- AdminAfterSalesController:list/detail/review/complete 仅 admin,非 admin -> 403「无权限」
- 保留契约直调重载(非 HTTP 路由)锁定「委托 service」正常流绿锚点;HTTP 统一走带守卫路由重载

测试:AdminOrderManualContractTest 24 例 5F(基线) -> 0F;相关 6 测试类 42 例无回归(SupplierAfterSales 4 例为 S-cfc-240 既有 RED)
zxyj-langgraph il y a 2 jours
Parent
commit
87ab339a1

+ 69 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminAfterSalesController.java

@@ -14,6 +14,18 @@ import java.util.List;
 import java.util.Map;
 import com.etotem.cfc.util.ParamUtils;
 
+/**
+ * 管理端-商城售后人工处理(能力键 {@code admin.order.manual},SC-A-12)。
+ *
+ * <p><b>B-142-1 双层防线(TR-13 权限流)</b>:{@code JwtInterceptor} 已把 {@code /api/admin/} 整族收口为
+ * 「必须登录」(匿名 → 401),但框架层不区分角色——登录的 parent/child/teacher 仍可越权查看/审核/完成售后。
+ * 故本控制器在 <b>HTTP 路由入口</b> 再做角色守卫:仅 {@code admin} 可操作,非 admin → 403「无权限」,
+ * 且不触达 service。
+ *
+ * <p><b>重载约定</b>:每个端点保留「HTTP 路由重载(带角色守卫)」与「契约直调重载(不带守卫,仅承载业务委托)」
+ * 两个同名方法——后者供契约单测/内部直接调用锁定「委托 service」契约(见
+ * {@code AdminOrderManualContractTest} 正常流绿锚点),HTTP 请求一律走带守卫的前者。
+ */
 @RestController
 @RequestMapping("/api/admin/shop/after-sales")
 public class AdminAfterSalesController {
@@ -22,20 +34,63 @@ public class AdminAfterSalesController {
     private AfterSalesService afterSalesService;
 
     @PostMapping("/list")
+    public Result<List<AfterSalesRequest>> list(@RequestBody Map<String, Object> params,
+                                                @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权查看全量售后
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doList(params);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 afterSalesService.adminList」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<List<AfterSalesRequest>> list(@RequestBody Map<String, Object> params) {
+        return doList(params);
+    }
+
+    private Result<List<AfterSalesRequest>> doList(Map<String, Object> params) {
         String status = params != null ? (String) params.get("status") : null;
         return afterSalesService.adminList(status);
     }
 
     @PostMapping("/detail")
+    public Result<AfterSalesRequest> detail(@RequestBody Map<String, Object> params,
+                                            @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权查看售后详情
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doDetail(params);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 afterSalesService.adminDetail」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<AfterSalesRequest> detail(@RequestBody Map<String, Object> params) {
+        return doDetail(params);
+    }
+
+    private Result<AfterSalesRequest> doDetail(Map<String, Object> params) {
         Long id = ParamUtils.getLong(params.get("id"));
         return afterSalesService.adminDetail(id);
     }
 
     @PostMapping("/review")
+    public Result<String> review(@RequestBody Map<String, Object> params,
+                                 @RequestAttribute("userId") Long adminId,
+                                 @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权审核售后(仅待审核可处理,见 AfterSalesService.review)
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doReview(params, adminId);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 afterSalesService.review」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<String> review(@RequestBody Map<String, Object> params,
                                  @RequestAttribute("userId") Long adminId) {
+        return doReview(params, adminId);
+    }
+
+    private Result<String> doReview(Map<String, Object> params, Long adminId) {
         Long id = ParamUtils.getLong(params.get("id"));
         String action = (String) params.get("action");
         String rejectReason = (String) params.get("rejectReason");
@@ -43,7 +98,21 @@ public class AdminAfterSalesController {
     }
 
     @PostMapping("/complete")
+    public Result<String> complete(@RequestBody Map<String, Object> params,
+                                   @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权完成售后
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doComplete(params);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 afterSalesService.complete」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<String> complete(@RequestBody Map<String, Object> params) {
+        return doComplete(params);
+    }
+
+    private Result<String> doComplete(Map<String, Object> params) {
         Long id = ParamUtils.getLong(params.get("id"));
         return afterSalesService.complete(id);
     }

+ 112 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminProductOrderController.java

@@ -1,5 +1,6 @@
 package com.etotem.cfc.controller.admin;
 
+import com.etotem.cfc.common.AdminRoles;
 import com.etotem.cfc.common.Result;
 import com.etotem.cfc.dto.ProductOrderDTO;
 import com.etotem.cfc.service.ProductOrderService;
@@ -16,6 +17,22 @@ import java.util.List;
 import java.util.Map;
 import com.etotem.cfc.util.SortUtil;
 
+/**
+ * 管理端-订单人工处理(能力键 {@code admin.order.manual},SC-A-12)。
+ *
+ * <p><b>B-142-1 双层防线(TR-13 权限流)</b>:{@code JwtInterceptor} 已把 {@code /api/admin/} 整族收口为
+ * 「必须登录」(匿名 → 401),但框架层不区分角色——登录的 parent/child/teacher 仍可越权发货、关单、
+ * 审批退款。故本控制器在 <b>HTTP 路由入口</b> 再做角色守卫:
+ * <ul>
+ *   <li>{@code /list}:平台角色(admin/operator/finance)与纯供应商(B-5 行级隔离)放行,
+ *       其余(C 端角色 parent/child 等)→ 403,避免拉取全量订单;</li>
+ *   <li>其余 6 个端点:仅 {@code admin} 可操作,非 admin → 403「无权限」,且不触达 service。</li>
+ * </ul>
+ *
+ * <p><b>重载约定</b>:每个端点保留「HTTP 路由重载(带角色守卫)」与「契约直调重载(不带守卫,仅承载业务委托)」
+ * 两个同名方法——后者供契约单测/内部直接调用锁定「委托 service」契约(见
+ * {@code AdminOrderManualContractTest} 正常流绿锚点),HTTP 请求一律走带守卫的前者。
+ */
 @RestController
 @RequestMapping("/api/admin/product/order")
 @Tag(name = "管理端-订单管理")
@@ -29,6 +46,11 @@ public class AdminProductOrderController {
     public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params,
                                             @RequestAttribute(value = "userId", required = false) Long userId,
                                             @RequestAttribute(value = "roles", required = false) java.util.List<String> roleList) {
+        // B-142-1:/api/admin/** 框架层只保证登录,controller 层须再校验角色——C 端角色(parent/child)
+        // 不得越权查看订单;平台角色与纯供应商(B-5 行级隔离)放行。
+        if (!AdminRoles.hasAnyPlatformRole(roleList) && !AdminRoles.isSupplierOnly(roleList)) {
+            return Result.forbidden("无权限");
+        }
         String status = (String) params.get("status");
         String keyword = (String) params.get("keyword");
         String buyerKeyword = (String) params.get("buyerKeyword");
@@ -47,7 +69,21 @@ public class AdminProductOrderController {
 
     @Operation(summary = "订单详情")
     @PostMapping("/detail")
+    public Result<ProductOrderDTO> detail(@RequestBody Map<String, Object> params,
+                                          @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin(parent/child/teacher)不得越权查看订单详情
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doDetail(params);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 orderService.adminOrderDetail」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<ProductOrderDTO> detail(@RequestBody Map<String, Object> params) {
+        return doDetail(params);
+    }
+
+    private Result<ProductOrderDTO> doDetail(Map<String, Object> params) {
         String orderNo = (String) params.get("orderNo");
         if (orderNo == null || orderNo.isEmpty()) {
             return Result.error("orderNo不能为空");
@@ -57,8 +93,23 @@ public class AdminProductOrderController {
 
     @Operation(summary = "订单发货(含快递单号+快递费)")
     @PostMapping("/ship")
+    public Result<String> ship(@RequestBody Map<String, Object> params,
+                               @RequestAttribute("userId") Long adminId,
+                               @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权发货
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doShip(params);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 orderService.ship」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<String> ship(@RequestBody Map<String, Object> params,
                                @RequestAttribute("userId") Long adminId) {
+        return doShip(params);
+    }
+
+    private Result<String> doShip(Map<String, Object> params) {
         String orderNo = (String) params.get("orderNo");
         String shipType = (String) params.get("shipType");
         String trackingNumber = (String) params.get("trackingNumber");
@@ -71,7 +122,21 @@ public class AdminProductOrderController {
 
     @Operation(summary = "更新订单快递信息")
     @PostMapping("/update-express")
+    public Result<String> updateExpress(@RequestBody Map<String, Object> params,
+                                         @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权修改快递信息
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doUpdateExpress(params);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 orderService.updateExpress」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<String> updateExpress(@RequestBody Map<String, Object> params) {
+        return doUpdateExpress(params);
+    }
+
+    private Result<String> doUpdateExpress(Map<String, Object> params) {
         String orderNo = (String) params.get("orderNo");
         String trackingNumber = (String) params.get("trackingNumber");
         String expressCompany = (String) params.get("expressCompany");
@@ -83,7 +148,22 @@ public class AdminProductOrderController {
     @Operation(summary = "关闭订单")
     @PostMapping("/close")
     public Result<String> close(@RequestBody Map<String, Object> params,
-                                  @RequestAttribute("userId") Long adminId) {
+                                @RequestAttribute("userId") Long adminId,
+                                @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权关单
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doClose(params, adminId);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 orderService.adminClose」契约,HTTP 请走带角色守卫的路由重载。 */
+    public Result<String> close(@RequestBody Map<String, Object> params,
+                                @RequestAttribute("userId") Long adminId) {
+        return doClose(params, adminId);
+    }
+
+    private Result<String> doClose(Map<String, Object> params, Long adminId) {
         String orderNo = (String) params.get("orderNo");
         if (orderNo == null || orderNo.isEmpty()) {
             return Result.error("orderNo不能为空");
@@ -93,18 +173,48 @@ public class AdminProductOrderController {
 
     @Operation(summary = "退款审核通过")
     @PostMapping("/refund/approve")
+    public Result<String> approveRefund(@RequestBody Map<String, Object> params,
+                                        @RequestAttribute("userId") Long adminId,
+                                        @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权审批退款
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doApproveRefund(params, adminId);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 orderService.approveRefund」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<String> approveRefund(@RequestBody Map<String, Object> params,
                                         @RequestAttribute("userId") Long adminId) {
+        return doApproveRefund(params, adminId);
+    }
+
+    private Result<String> doApproveRefund(Map<String, Object> params, Long adminId) {
         String orderNo = (String) params.get("orderNo");
         return orderService.approveRefund(orderNo, adminId);
     }
 
     @Operation(summary = "退款审核拒绝")
     @PostMapping("/refund/reject")
+    public Result<String> rejectRefund(@RequestBody Map<String, Object> params,
+                                       @RequestAttribute("userId") Long adminId,
+                                       @RequestAttribute("role") String role) {
+        // B-142-1:角色守卫——非 admin 不得越权驳回退款
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return doRejectRefund(params, adminId);
+    }
+
+    /** 契约直调重载(非 HTTP 路由):锁定「委托 orderService.rejectRefund」契约,HTTP 请走带角色守卫的路由重载。 */
     public Result<String> rejectRefund(@RequestBody Map<String, Object> params,
                                        @RequestAttribute("userId") Long adminId) {
+        return doRejectRefund(params, adminId);
+    }
+
+    private Result<String> doRejectRefund(Map<String, Object> params, Long adminId) {
         String orderNo = (String) params.get("orderNo");
         String reason = (String) params.get("reason");
         return orderService.rejectRefund(orderNo, adminId, reason);
     }
-}
+}