|
@@ -1,5 +1,6 @@
|
|
|
package com.etotem.cfc.controller.admin;
|
|
package com.etotem.cfc.controller.admin;
|
|
|
|
|
|
|
|
|
|
+import com.etotem.cfc.common.AdminRoles;
|
|
|
import com.etotem.cfc.common.Result;
|
|
import com.etotem.cfc.common.Result;
|
|
|
import com.etotem.cfc.dto.ProductOrderDTO;
|
|
import com.etotem.cfc.dto.ProductOrderDTO;
|
|
|
import com.etotem.cfc.service.ProductOrderService;
|
|
import com.etotem.cfc.service.ProductOrderService;
|
|
@@ -16,6 +17,22 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
import com.etotem.cfc.util.SortUtil;
|
|
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
|
|
@RestController
|
|
|
@RequestMapping("/api/admin/product/order")
|
|
@RequestMapping("/api/admin/product/order")
|
|
|
@Tag(name = "管理端-订单管理")
|
|
@Tag(name = "管理端-订单管理")
|
|
@@ -29,6 +46,11 @@ public class AdminProductOrderController {
|
|
|
public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params,
|
|
public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params,
|
|
|
@RequestAttribute(value = "userId", required = false) Long userId,
|
|
@RequestAttribute(value = "userId", required = false) Long userId,
|
|
|
@RequestAttribute(value = "roles", required = false) java.util.List<String> roleList) {
|
|
@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 status = (String) params.get("status");
|
|
|
String keyword = (String) params.get("keyword");
|
|
String keyword = (String) params.get("keyword");
|
|
|
String buyerKeyword = (String) params.get("buyerKeyword");
|
|
String buyerKeyword = (String) params.get("buyerKeyword");
|
|
@@ -47,7 +69,21 @@ public class AdminProductOrderController {
|
|
|
|
|
|
|
|
@Operation(summary = "订单详情")
|
|
@Operation(summary = "订单详情")
|
|
|
@PostMapping("/detail")
|
|
@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) {
|
|
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");
|
|
String orderNo = (String) params.get("orderNo");
|
|
|
if (orderNo == null || orderNo.isEmpty()) {
|
|
if (orderNo == null || orderNo.isEmpty()) {
|
|
|
return Result.error("orderNo不能为空");
|
|
return Result.error("orderNo不能为空");
|
|
@@ -57,8 +93,23 @@ public class AdminProductOrderController {
|
|
|
|
|
|
|
|
@Operation(summary = "订单发货(含快递单号+快递费)")
|
|
@Operation(summary = "订单发货(含快递单号+快递费)")
|
|
|
@PostMapping("/ship")
|
|
@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,
|
|
public Result<String> ship(@RequestBody Map<String, Object> params,
|
|
|
@RequestAttribute("userId") Long adminId) {
|
|
@RequestAttribute("userId") Long adminId) {
|
|
|
|
|
+ return doShip(params);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private Result<String> doShip(Map<String, Object> params) {
|
|
|
String orderNo = (String) params.get("orderNo");
|
|
String orderNo = (String) params.get("orderNo");
|
|
|
String shipType = (String) params.get("shipType");
|
|
String shipType = (String) params.get("shipType");
|
|
|
String trackingNumber = (String) params.get("trackingNumber");
|
|
String trackingNumber = (String) params.get("trackingNumber");
|
|
@@ -71,7 +122,21 @@ public class AdminProductOrderController {
|
|
|
|
|
|
|
|
@Operation(summary = "更新订单快递信息")
|
|
@Operation(summary = "更新订单快递信息")
|
|
|
@PostMapping("/update-express")
|
|
@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) {
|
|
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 orderNo = (String) params.get("orderNo");
|
|
|
String trackingNumber = (String) params.get("trackingNumber");
|
|
String trackingNumber = (String) params.get("trackingNumber");
|
|
|
String expressCompany = (String) params.get("expressCompany");
|
|
String expressCompany = (String) params.get("expressCompany");
|
|
@@ -83,7 +148,22 @@ public class AdminProductOrderController {
|
|
|
@Operation(summary = "关闭订单")
|
|
@Operation(summary = "关闭订单")
|
|
|
@PostMapping("/close")
|
|
@PostMapping("/close")
|
|
|
public Result<String> close(@RequestBody Map<String, Object> params,
|
|
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");
|
|
String orderNo = (String) params.get("orderNo");
|
|
|
if (orderNo == null || orderNo.isEmpty()) {
|
|
if (orderNo == null || orderNo.isEmpty()) {
|
|
|
return Result.error("orderNo不能为空");
|
|
return Result.error("orderNo不能为空");
|
|
@@ -93,18 +173,48 @@ public class AdminProductOrderController {
|
|
|
|
|
|
|
|
@Operation(summary = "退款审核通过")
|
|
@Operation(summary = "退款审核通过")
|
|
|
@PostMapping("/refund/approve")
|
|
@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,
|
|
public Result<String> approveRefund(@RequestBody Map<String, Object> params,
|
|
|
@RequestAttribute("userId") Long adminId) {
|
|
@RequestAttribute("userId") Long adminId) {
|
|
|
|
|
+ return doApproveRefund(params, adminId);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private Result<String> doApproveRefund(Map<String, Object> params, Long adminId) {
|
|
|
String orderNo = (String) params.get("orderNo");
|
|
String orderNo = (String) params.get("orderNo");
|
|
|
return orderService.approveRefund(orderNo, adminId);
|
|
return orderService.approveRefund(orderNo, adminId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Operation(summary = "退款审核拒绝")
|
|
@Operation(summary = "退款审核拒绝")
|
|
|
@PostMapping("/refund/reject")
|
|
@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,
|
|
public Result<String> rejectRefund(@RequestBody Map<String, Object> params,
|
|
|
@RequestAttribute("userId") Long adminId) {
|
|
@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 orderNo = (String) params.get("orderNo");
|
|
|
String reason = (String) params.get("reason");
|
|
String reason = (String) params.get("reason");
|
|
|
return orderService.rejectRefund(orderNo, adminId, reason);
|
|
return orderService.rejectRefund(orderNo, adminId, reason);
|
|
|
}
|
|
}
|
|
|
-}
|
|
|
|
|
|
|
+}
|