Merge branch 'master' of http://101.133.135.193:20080/huhao/baoshi-was

app/Http/Controllers/PackageLogisticController.php

@@ -163,6 +163,7 @@ class PackageLogisticController extends Controller
         $row = [
             '单号',
             '状态',
+            '异常状态',
             '快递公司',
             '货主',
             '省份',
@@ -216,6 +217,7 @@ class PackageLogisticController extends Controller
             $data = [
                 $orderPackage->logistic_number ?? '',//单号
                 $orderPackage->status ?? '',//状态
+                $orderPackage->exception_status ?? '',//异常状态
                 $orderPackage->order->logistic->name ?? '',//快递公司
                 $orderPackage->order->owner->name ?? '',//货主
                 $orderPackage->order->province ?? '',//省份

app/Services/WorkOrderInterceptService.php

@@ -200,7 +200,9 @@ 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','!=', 6)->orderByDesc('created_at')->first();
+        $detail = $workOrder->details()->where('order_issue_type_id', $issueType->id)
+            ->whereNotIn('status',[5,6])
+            ->orderByDesc('created_at')->first();
         if (!$detail) return;
         $process_progress = '成功已退回，不赔偿';
         $detail->update([