Просмотр исходного кода

工单->修改自动拦截问题

loustwo 4 лет назад
Родитель
Сommit
2836b23d5f

+ 1 - 1
app/Services/OrderRejectingStatusService.php

@@ -52,7 +52,7 @@ class OrderRejectingStatusService
         if ($rejecting_status == '全部完成') {
             $orderIssueTypeQuery = OrderIssueType::query()->where('name','拦截');
             $workOrder = WorkOrder::query()->where('order_id',$order->id)
-                ->whereIn('order_issue_type_id',$orderIssueTypeQuery)->where('status',4)->first();
+                ->whereIn('order_issue_type_id',$orderIssueTypeQuery)->where('status','!=',6)->first();
             if($workOrder){
                 app(WorkOrderInterceptService::class)->autoReviewIntercept($workOrder);
             }

+ 1 - 1
app/Services/WorkOrderInterceptService.php

@@ -198,7 +198,7 @@ class WorkOrderInterceptService extends WorkOrderService
         /** @var WorkOrderDetail $detail */
         $issueType = $this->issueTypeService->firstOrCreate(['name' => '拦截']);
         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();
+        $detail = $workOrder->details()->where('order_issue_type_id', $issueType->id)->where('status','!=', 6)->orderByDesc('created_at')->first();
         if (!$detail) return;
         $process_progress = '成功已退回,不赔偿';
         $detail->update([