diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index d395d67..2043a86 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -620,14 +620,16 @@ class Order extends Backend 'update_time' => now()->format('Y-m-d H:m:s'), ]; + $orderDispatch = OrderDispatch::where('order_id',$order->id)->whereBetween('status','>=',0)->find(); if ($params['abnormal_id'] == 2 || $params['abnormal_id'] == 3) { $order->status = \app\admin\model\Order::STATUS_CANCEL; $order->save(); - if (!empty($order->dispatch->id)) { + + if (!empty($orderDispatch)) { $orderLogic = new OrderLogic(); - $orderLogic->cancelOrderDispatch($order->dispatch, $this->auth, '订单被取消', false); + $orderLogic->cancelOrderDispatch($orderDispatch, $this->auth, '订单被取消', false); //日志 $hookparams['order'] = $order; $hookparams['role'] = 1; @@ -647,9 +649,9 @@ class Order extends Backend $order->status = \app\admin\model\Order::STATUS_DISPATCHING; $order->save(); - if (!empty($order->dispatch->id)) { + if (!empty($orderDispatch)) { $OrderLogic = new OrderLogic(); - $OrderLogic->noWorkerCanGetIt($order->dispatch, '系统取消' . $abnormal_title); + $OrderLogic->noWorkerCanGetIt($orderDispatch, '系统取消' . $abnormal_title); AutoDispatchLogic::autoDispatch($order); } @@ -672,7 +674,6 @@ class Order extends Backend $result = \model('order_abnormal')->insert($insert); Db::commit(); } catch (ValidateException|PDOException|Exception $e) { - throw $e; Db::rollback(); $this->error($e->getMessage()); }