diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index c4d0ae4a..40355df3 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -735,6 +735,13 @@ public class OrderMasterController extends BaseController { @PostMapping("/cancel") @ResponseBody public AjaxResult cancel(Long orderMasterId) throws BaseAdaPayException { + // 校验 + List orderDetails = orderDetailService.selectByOrderMasterId(orderMasterId); + for (OrderDetail detail : orderDetails) { + if (detail.getOrderStatus() != 6) { + return AjaxResult.error("退单请入详情内操作!"); + } + } orderMasterService.applyForCancel(orderMasterId); return AjaxResult.success(); }