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;