From f812e5f23944ccb58baa1d478c87bfc828962b0b Mon Sep 17 00:00:00 2001 From: xboard Date: Wed, 13 Dec 2023 03:00:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=AD=E7=9A=84=E4=BA=8B=E5=8A=A1=E5=AE=89?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/V1/User/TicketController.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/V1/User/TicketController.php b/app/Http/Controllers/V1/User/TicketController.php index 1cc2e72..bbb07e5 100644 --- a/app/Http/Controllers/V1/User/TicketController.php +++ b/app/Http/Controllers/V1/User/TicketController.php @@ -44,7 +44,7 @@ class TicketController extends Controller try{ DB::beginTransaction(); if ((int)Ticket::where('status', 0)->where('user_id', $request->user['id'])->lockForUpdate()->count()) { - return $this->fail([400, __('There are other unresolved tickets')]); + throw new \Exception(__('There are other unresolved tickets')); } $ticket = Ticket::create(array_merge($request->only([ 'subject', @@ -53,7 +53,7 @@ class TicketController extends Controller 'user_id' => $request->user['id'] ])); if (!$ticket) { - return $this->fail([400, __('Failed to open ticket')]); + throw new \Exception(__('There are other unresolved tickets')); } $ticketMessage = TicketMessage::create([ 'user_id' => $request->user['id'], @@ -61,15 +61,17 @@ class TicketController extends Controller 'message' => $request->input('message') ]); if (!$ticketMessage) { - return $this->fail([400, __('Failed to open ticket')]); + throw new \Exception(__('Failed to open ticket')); } DB::commit(); + $this->sendNotify($ticket, $request->input('message'), $request->user['id']); + return $this->success(true); }catch(\Exception $e){ DB::rollBack(); - throw $e; + \Log::error($e); + return $this->fail([400, $e->getMessage()]); } - $this->sendNotify($ticket, $request->input('message'), $request->user['id']); - return $this->success(true); + } public function reply(Request $request)