From 814b74522a3215aacbc5af38cfef93a855dfbbf9 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Tue, 18 Apr 2023 13:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=8A=B6=E6=80=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/order/OrderMasterController.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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<OrderDetail> 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("退单请入详情内操作！");
             }
         }