From 090890f7e24c4c2bc1d665c094604c5f5711e949 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Fri, 27 Jun 2025 11:20:01 +0800
Subject: [PATCH] sth

---
 application/admin/controller/Order.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php
index de93262..187e9b8 100644
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@@ -704,7 +704,7 @@ class Order extends Backend
 
         $result = false;
         Db::startTrans();
-        $order = model('order')->get($params['order_id'], ['dispatch']);
+        $order = model('order')->get($params['order_id']);
         if (!$order) {
             $this->error('Not Find');
         }
@@ -717,9 +717,10 @@ class Order extends Backend
 
             $result = $order->allowField(true)->save($params);
 
-            if (!empty($order->dispatch->id)) {
+            $dispatch = OrderDispatch::where('order_id', $order->id)->where('status','>',0)->find();
+            if (!empty($dispatch)) {
                 $orderLogic = new OrderLogic();
-                $orderLogic->cancelOrderDispatch($order->dispatch, $this->auth, '订单被取消', false);
+                $orderLogic->cancelOrderDispatch($dispatch, $this->auth, '订单被取消', false);
             }
             //日志
             $hookparams['order'] = $order;