From 763a40d154f795bd0e7bcd8e1eacc06f5332a567 Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Thu, 2 Feb 2023 00:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/ReplyController.php | 12 +++++------- app/Jobs/WorkOrder/WorkOrder.php | 8 ++++---- app/Models/WorkOrder/WorkOrder.php | 1 + 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Api/ReplyController.php b/app/Http/Controllers/Api/ReplyController.php index 83874da..04ef71d 100644 --- a/app/Http/Controllers/Api/ReplyController.php +++ b/app/Http/Controllers/Api/ReplyController.php @@ -5,17 +5,16 @@ use App\Http\Controllers\Controller; use App\Models\WorkOrder\Reply; use App\Models\WorkOrder\WorkOrder; +use function auth; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use function auth; class ReplyController extends Controller { /** * Display a listing of the resource. * - * @param WorkOrder $workOrder - * + * @param WorkOrder $workOrder * @return JsonResponse */ public function index(WorkOrder $workOrder): JsonResponse @@ -28,9 +27,8 @@ public function index(WorkOrder $workOrder): JsonResponse /** * Store a newly created resource in storage. * - * @param Request $request - * @param WorkOrder $workOrder - * + * @param Request $request + * @param WorkOrder $workOrder * @return JsonResponse */ public function store(Request $request, WorkOrder $workOrder): JsonResponse @@ -44,7 +42,7 @@ public function store(Request $request, WorkOrder $workOrder): JsonResponse } // 如果工单已经关闭,那么访客不能回复 - if ($workOrder->isClosed() && !auth('sanctum')->check()) { + if ($workOrder->isClosed() && ! auth('sanctum')->check()) { return $this->error('工单已关闭,无法进行回复。'); } diff --git a/app/Jobs/WorkOrder/WorkOrder.php b/app/Jobs/WorkOrder/WorkOrder.php index 722b513..3f58e16 100644 --- a/app/Jobs/WorkOrder/WorkOrder.php +++ b/app/Jobs/WorkOrder/WorkOrder.php @@ -47,17 +47,17 @@ public function handle(): void if ($this->type == 'post') { $response = $this->workOrder->module->http()->post('work-orders', $this->workOrder->toArray()); - } else if ($this->type == 'put') { - $response = $this->workOrder->module->http()->put('work-orders/' . $this->workOrder->id, $this->workOrder->toArray()); + } elseif ($this->type == 'put') { + $response = $this->workOrder->module->http()->put('work-orders/'.$this->workOrder->id, $this->workOrder->toArray()); } else { - $response = $this->workOrder->module->http()->delete('work-orders/' . $this->workOrder->id); + $response = $this->workOrder->module->http()->delete('work-orders/'.$this->workOrder->id); if ($response->successful()) { $this->workOrder->delete(); } } - if (!$response->successful()) { + if (! $response->successful()) { Log::debug('WorkOrder push failed', [ 'type' => $this->type, 'response' => $response->json(), diff --git a/app/Models/WorkOrder/WorkOrder.php b/app/Models/WorkOrder/WorkOrder.php index c2f9600..0bc6230 100644 --- a/app/Models/WorkOrder/WorkOrder.php +++ b/app/Models/WorkOrder/WorkOrder.php @@ -155,6 +155,7 @@ public function safeDelete(): bool } else { dispatch(new WorkOrderJob($this, 'delete')); } + return true; }