Merge remote-tracking branch 'origin/master'

app/Services/WorkOrderInterceptService.php

@@ -95,7 +95,8 @@ class WorkOrderInterceptService extends WorkOrderService
     {
         /** @var WorkOrderDetail $detail */
         $issueType = $this->issueTypeService->firstOrCreate(['name' => '拦截']);
-        $detail = $workOrder->details()->where('order_issue_type_id',$issueType->id)->orderByDesc('created_at')->first();
+        if ($workOrder->order_issue_type_id != $issueType->id) return;
+        $detail = $workOrder->details()->where('order_issue_type_id',$issueType->id)->where('status','宝时终审')->orderByDesc('created_at')->first();
         if (!$detail) return;
         $this->logService->createLog($detail, '终审', '自动终审');
         $detail->change('待货主完结','成功已退回，不赔偿','宝时终审');