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 40355df3..304aed72 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 @@ -738,7 +738,9 @@ public class OrderMasterController extends BaseController { // 校验 List orderDetails = orderDetailService.selectByOrderMasterId(orderMasterId); for (OrderDetail detail : orderDetails) { - if (detail.getOrderStatus() != 6) { + if (detail.getOrderStatus() == 6 || detail.getOrderStatus() == 0 || detail.getOrderStatus() == 1) { + + }else { return AjaxResult.error("退单请入详情内操作!"); } }