diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index e4f9b3e..008a31b 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -642,8 +642,8 @@ 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(); - + $orderDispatch = OrderDispatch::where('order_id', $order->id) + ->where('status', '>=', 0)->find(); if ($params['abnormal_id'] == 2 || $params['abnormal_id'] == 3) { $order->status = \app\admin\model\Order::STATUS_CANCEL; @@ -696,6 +696,7 @@ 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()); }