From 3e0495a90add82a637babbe46d8073dcac4281df Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Tue, 9 Jul 2024 10:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/svc/order/svc_order_list.go | 2 +-
 app/db/db_order_list.go               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin/svc/order/svc_order_list.go b/app/admin/svc/order/svc_order_list.go
index 6d185d5..51541d6 100644
--- a/app/admin/svc/order/svc_order_list.go
+++ b/app/admin/svc/order/svc_order_list.go
@@ -769,7 +769,7 @@ func OrderUpdateState(c *gin.Context) {
 		return
 	}
 	sess1 := sess
-	sess1.Where("state!=5")
+	sess1.Where("state!=5 and state!=4")
 	if args["ids"] != "" {
 		sess1.In("oid", strings.Split(args["ids"], ","))
 	}
diff --git a/app/db/db_order_list.go b/app/db/db_order_list.go
index 3392562..24b45ed 100644
--- a/app/db/db_order_list.go
+++ b/app/db/db_order_list.go
@@ -18,7 +18,7 @@ func GetOrderById(eg *xorm.Engine, id string) *model.Order {
 }
 func GetOrderByMore(sess *xorm.Session, args map[string]string) *[]model.Order {
 	var order []model.Order
-	sess1 := sess.Where("state!=5")
+	sess1 := sess.Where("state!=5 and state!=4")
 	if args["ids"] != "" {
 		sess1.In("oid", strings.Split(args["ids"], ","))
 	}