From 2889674eed1ac3c9c1691e8ce15016be422a59fe Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Mon, 17 Apr 2023 11:04:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9C=89=E5=AD=90=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E3=80=82=E6=8F=90=E7=A4=BA=EF=BC=9A=E9=80=80=E5=8D=95?= =?UTF-8?q?=E8=AF=B7=E5=85=A5=E8=AF=A6=E6=83=85=E5=86=85=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/order/OrderMasterController.java | 7 +++++++ 1 file changed, 7 insertions(+) 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(); }