处理日志添加和工单同步至问题件

app/Http/Controllers/WorkOrderExpressAbnormalController.php

@@ -11,17 +11,13 @@ use Illuminate\Support\Facades\Gate;
 
 class WorkOrderExpressAbnormalController extends Controller
 {
-    /**
-     * @var WorkOrderExpressAbnormalService $service
-     * @var OrderService $orderService
-     */
     private $service;
     private $orderService;
 
-    public function __construct()
+    public function __construct(WorkOrderExpressAbnormalService $service,OrderService $orderService)
     {
-        $this->service = app('WorkOrderExpressAbnormalService');
-        $this->orderService = app('OrderService');
+        $this->service = $service;
+        $this->orderService = $orderService;
     }
 
     public function storeApi(Request $request): array

app/Http/Controllers/WorkOrderLossController.php

@@ -33,7 +33,6 @@ class WorkOrderLossController extends Controller
 
         if ($this->service->checkWorkOrder($request->input('order_no')))
             return ['success' => false, 'message' => '当前订单已有相同类型的工单'];
-
         $this->service->store($request->all());
         return ['success' => true];
     }

app/Http/Controllers/WorkOrderProcessLogController.php

@@ -25,7 +25,7 @@ class WorkOrderProcessLogController extends Controller
 
     public function storeApi(Request $request): array
     {
-        if (Gate::denies('订单管理-工单处理-宝时编辑') ||
+        if (Gate::denies('订单管理-工单处理-宝时编辑') &&
             Gate::denies('订单管理-工单处理-承运商编辑')) {
             return ['success' => false, 'message' => '没有对应的权限'];
         }

app/Services/WorkOrderCancelInterceptService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\Order;
 use App\WorkOrder;
 use App\WorkOrderDetail;
+use Illuminate\Support\Facades\Auth;
 
 class WorkOrderCancelInterceptService extends WorkOrderService
 {
@@ -15,10 +16,13 @@ class WorkOrderCancelInterceptService extends WorkOrderService
         WorkOrderCommoditiesService $commoditiesService,
         WorkOrderDetailService $detailService,
         OrderIssueTypeService $issueTypeService,
-        OrderService $orderService
+        OrderService $orderService,
+        OrderIssueService $orderIssueService,
+        OrderIssueProcessLogService $orderIssueProcessLogService
+
     )
     {
-        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService);
+        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService,$orderIssueService,$orderIssueProcessLogService);
     }
 
     public function checkWorkOrder($nos)
@@ -48,9 +52,10 @@ class WorkOrderCancelInterceptService extends WorkOrderService
         $issueType = $this->issueTypeService->firstOrCreate(['name' => '取消拦截']);
         $order = $this->syncOrder($params['order_no']);
         $workOrder = $this->createAndNotification($order, $issueType, $params['remark'] ?? '');
+        $process_progress = '商家创建';
         $workOrder->update([
             'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_tag' => WorkOrder::$NEW_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
@@ -60,10 +65,18 @@ class WorkOrderCancelInterceptService extends WorkOrderService
         $detail = $this->detailService->createWorkOrderDetail($workOrder, $params);
         $detail->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_handle_tag' =>0,
         ]);
+        $detail->processLogs()->create([
+            'work_order_id' => $detail->work_order_id,
+            'work_order_detail_id' => $detail->id,
+            'user_id' => Auth::id(),
+            'content' => $process_progress.'-取消拦截',
+            'status' => '未同步',
+            'type' => '创建',
+        ]);
         $this->logService->createLog($detail, '创建', '创建工单');
     }
 
@@ -82,24 +95,33 @@ class WorkOrderCancelInterceptService extends WorkOrderService
     public function logisticHandle(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress = $params['process_progress'];
+
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'logistic_handle_tag' =>0,
         ]);
 
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'work_order_status' => 0,
         ]);
-        $this->endOrderIssueAndSyncProcessLogs($detail);
-        $this->logService->createLog($detail, '处理', $params['process_progress'].'-承运商处理');
+        $detail->processLogs()->create([
+            'work_order_id' => $detail->work_order_id,
+            'work_order_detail_id' => $detail->id,
+            'user_id' => Auth::id(),
+            'content' => $process_progress,
+            'status' => '未同步',
+            'type' => '处理',
+        ]);
+        $this->logService->createLog($detail, '处理', $process_progress.'-承运商处理');
     }
 
     /**
@@ -122,22 +144,32 @@ class WorkOrderCancelInterceptService extends WorkOrderService
     public function baoShiReview(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
             'work_order_status' => 0,
         ]);
-        $this->logService->createLog($detail, '终审', $params['process_progress'].'-宝时终审');
+        $detail->processLogs()->create([
+            'work_order_id' => $detail->work_order_id,
+            'work_order_detail_id' => $detail->id,
+            'user_id' => Auth::id(),
+            'content' => $process_progress.'-完结',
+            'status' => '未同步',
+            'type' => '结束',
+        ]);
+        $this->endOrderIssueAndSyncProcessLogs($detail);
+        $this->logService->createLog($detail, '终审', $process_progress.'-宝时终审');
     }
 
     /**

app/Services/WorkOrderDamageService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\Order;
 use App\WorkOrder;
 use App\WorkOrderDetail;
+use Illuminate\Support\Facades\Auth;
 
 /**
  * 处理 破损 工单
@@ -19,7 +20,9 @@ class WorkOrderDamageService extends WorkOrderService
         WorkOrderCommoditiesService $commoditiesService,
         WorkOrderDetailService $detailService,
         OrderIssueTypeService $issueTypeService,
-        OrderService $orderService
+        OrderService $orderService,
+        OrderIssueService $orderIssueService,
+        OrderIssueProcessLogService $orderIssueProcessLogService
     )
     {
         parent::__construct($logService,
@@ -27,7 +30,9 @@ class WorkOrderDamageService extends WorkOrderService
             $commoditiesService,
             $detailService,
             $issueTypeService,
-            $orderService
+            $orderService,
+            $orderIssueService,
+            $orderIssueProcessLogService
         );
     }
 
@@ -54,9 +59,10 @@ class WorkOrderDamageService extends WorkOrderService
         $issueType = $this->issueTypeService->firstOrCreate(['name' => '破损']);
         $order = $this->syncOrder($params['order_no']);
         $workOrder = $this->createAndNotification($order, $issueType, $params['remark'] ?? '');
+        $process_progress = '商家创建';
         $workOrder->update([
             'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_tag' => WorkOrder::$NEW_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
@@ -65,11 +71,19 @@ class WorkOrderDamageService extends WorkOrderService
         $detail = $this->detailService->createWorkOrderDetail($workOrder, $params);
         $detail->update([
             'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'work_order_status' => 0,
             'logistic_handle_tag' =>0,
         ]);
+        $detail->processLogs()->create([
+            'work_order_id' => $detail->work_order_id,
+            'work_order_detail_id' => $detail->id,
+            'user_id' => Auth::id(),
+            'content' => $process_progress.'-破损',
+            'status' => '未同步',
+            'type' => '创建',
+        ]);
         $this->logService->createLog($detail, '创建', '创建工单');
     }
 
@@ -81,18 +95,27 @@ class WorkOrderDamageService extends WorkOrderService
     public function ownerEdit(WorkOrderDetail $detail,$params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress = '商家创建';
         $detail->update([
             'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'work_order_status' => 0,
         ]);
+        $detail->processLogs()->create([
+            'work_order_id' => $detail->work_order_id,
+            'work_order_detail_id' => $detail->id,
+            'user_id' => Auth::id(),
+            'content' => '商家重编辑',
+            'status' => '未同步',
+            'type' => '处理',
+        ]);
         $this->logService->createLog($detail, '处理', '货主编辑');
 
     }
@@ -105,25 +128,32 @@ class WorkOrderDamageService extends WorkOrderService
     public function logisticHandle(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
-
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'logistic_handle_tag' =>0,
         ]);
 
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'work_order_status' => 0,
         ]);
-
-        $this->logService->createLog($detail, '处理', $params['process_progress'].'-承运商处理');
+        $detail->processLogs()->create([
+            'work_order_id' => $detail->work_order_id,
+            'work_order_detail_id' => $detail->id,
+            'user_id' => Auth::id(),
+            'content' => $process_progress,
+            'status' => '未同步',
+            'type' => '处理',
+        ]);
+        $this->logService->createLog($detail, '处理', $process_progress.'-承运商处理');
     }
 
     /**
@@ -134,24 +164,33 @@ class WorkOrderDamageService extends WorkOrderService
     public function baoShiReview(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'logistic_handle_tag' =>0,
         ]);
 
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
             'work_order_status' => 0,
         ]);
+        $detail->processLogs()->create([
+            'work_order_id' => $detail->work_order_id,
+            'work_order_detail_id' => $detail->id,
+            'user_id' => Auth::id(),
+            'content' => $process_progress.'-完结',
+            'status' => '未同步',
+            'type' => '完结',
+        ]);
         $this->endOrderIssueAndSyncProcessLogs($detail);
-        $this->logService->createLog($detail, '终审', $params['process_progress'].'-宝时终审');
+        $this->logService->createLog($detail, '终审', $process_progress.'-宝时终审');
     }
 
 }

app/Services/WorkOrderExpressAbnormalService.php

@@ -20,10 +20,20 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
         WorkOrderCommoditiesService $commoditiesService,
         WorkOrderDetailService $detailService,
         OrderIssueTypeService $issueTypeService,
-        OrderService $orderService
+        OrderService $orderService,
+        OrderIssueService $orderIssueService,
+        OrderIssueProcessLogService $orderIssueProcessLogService
     )
     {
-        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService);
+        parent::__construct(
+            $logService,
+            $imageService,
+            $commoditiesService,
+            $detailService,
+            $issueTypeService,
+            $orderService,
+            $orderIssueService,
+            $orderIssueProcessLogService);
     }
 
     public function checkWorkOrder($nos)
@@ -52,27 +62,28 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
     {
         $order = $this->syncOrder($params['order_no']);
         $issueType = $this->issueTypeService->firstOrCreate(['name' => '快递异常']);
-        $workOrder = $this->createOrResetWorkOrder($order, $issueType, $params['remark'] ?? '', $params['type']);
-        $workOrder->update([
+        $work_order = $this->createOrResetWorkOrder($order, $issueType, $params['remark'] ?? '', $params['type']);
+        $process_progress = '商家创建';
+        $work_order->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_tag' => WorkOrder::$NEW_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
         ]);
-        $detail = $this->detailService->createWorkOrderDetail($workOrder, $params);
+        $detail = $this->detailService->createWorkOrderDetail($work_order, $params);
         $detail->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
-            'logistic_handle_tag' =>0,
+            'logistic_handle_tag' => 0,
         ]);
         $detail->processLogs()->create([
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '创建-快递异常工单',
+            'content' => $process_progress.'-快递异常',
             'status' => '未同步',
             'type' => '创建',
         ]);
@@ -87,23 +98,23 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
     public function ownerEdit(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
-
+        $process_progress = '商家创建';
         $detail->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
         ]);
 
         $detail->workOrder()->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
         ]);
         $detail->processLogs()->create([
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '商家重编辑-快递异常工单',
+            'content' => '商家重编辑',
             'status' => '未同步',
             'type' => '处理',
         ]);
@@ -118,15 +129,16 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
     public function logisticHandle(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress= $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
         ]);
 
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
@@ -136,11 +148,11 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '承运商处理-快递异常工单',
+            'content' => $process_progress,
             'status' => '未同步',
             'type' => '处理',
         ]);
-        $this->logService->createLog($detail, '处理', $params['process_progress'] . '-承运商处理');
+        $this->logService->createLog($detail, '处理', $process_progress . '-承运商处理');
     }
 
     /**
@@ -151,14 +163,16 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
     public function baoShiReview(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress= $params['process_progress'];
+
         $detail->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
@@ -168,12 +182,12 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '完结-快递异常工单',
+            'content' => $process_progress.'-完结',
             'status' => '未同步',
             'type' => '结束',
         ]);
         $this->endOrderIssueAndSyncProcessLogs($detail);
-        $this->logService->createLog($detail, '终审', $params['process_progress'] . '-宝时终审');
+        $this->logService->createLog($detail, '终审', $process_progress . '-宝时终审');
     }
 
 }

app/Services/WorkOrderInformationChangeService.php

@@ -27,8 +27,8 @@ class WorkOrderInformationChangeService extends WorkOrderService
     {
         parent::__construct($logService, $imageService,
             $commoditiesService, $detailService,
-            $issueTypeService, $orderService,$orderIssueService,
-        $orderIssueService);
+            $issueTypeService, $orderService, $orderIssueService,
+            $orderIssueProcessLogService);
     }
 
     public function checkWorkOrder($nos)
@@ -60,10 +60,10 @@ class WorkOrderInformationChangeService extends WorkOrderService
         $order = $this->syncOrder($params['order_no']);
 
         $workOrder = $this->createAndNotification($order, $issueType, $params['remark'] ?? '');
-
+        $process_progress = '商家创建';
         $workOrder->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_tag' => WorkOrder::$NEW_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
@@ -74,7 +74,7 @@ class WorkOrderInformationChangeService extends WorkOrderService
 
         $detail->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
         ]);
 
@@ -82,7 +82,7 @@ class WorkOrderInformationChangeService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '创建-信息更改工单',
+            'content' => $process_progress.'-信息更改',
             'status' => '未同步',
             'type' => '创建',
         ]);
@@ -97,17 +97,17 @@ class WorkOrderInformationChangeService extends WorkOrderService
      */
     public function ownerEdit(WorkOrderDetail $detail, $params)
     {
-        $this->logService->createLog($detail, '处理', '商家编辑');
         $detail->update(['remark' => $params['remark']]);
         $detail->workOrder()->update(['remark' => $params['remark']]);
         $detail->processLogs()->create([
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '商家重编辑-信息更改工单',
+            'content' => '商家重编辑',
             'status' => '未同步',
             'type' => '处理',
         ]);
+        $this->logService->createLog($detail, '处理', '商家编辑');
     }
 
     /**
@@ -117,16 +117,16 @@ class WorkOrderInformationChangeService extends WorkOrderService
      */
     public function logisticHandler(WorkOrderDetail $detail, $params)
     {
-
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
         ]);
 
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
@@ -137,11 +137,11 @@ class WorkOrderInformationChangeService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '处理-信息更改工单',
+            'content' => $process_progress,
             'status' => '未同步',
             'type' => '处理',
         ]);
-        $this->logService->createLog($detail, '处理', '承运商处理-' . $params['process_progress']);
+        $this->logService->createLog($detail, '处理', '承运商处理-'.$process_progress);
     }
 
     /**
@@ -163,14 +163,15 @@ class WorkOrderInformationChangeService extends WorkOrderService
      */
     public function baoShiReview(WorkOrderDetail $detail, $params)
     {
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
@@ -181,13 +182,12 @@ class WorkOrderInformationChangeService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '完结-信息更改工单',
+            'content' => $process_progress.'-完结',
             'status' => '未同步',
-            'type' => '处理',
+            'type' => '结束',
         ]);
-
         $this->endOrderIssueAndSyncProcessLogs($detail);
-        $this->logService->createLog($detail, '终审', '宝时终审-' . $params['process_progress']);
+        $this->logService->createLog($detail, '终审', '宝时终审-' . $process_progress);
     }
 
     /**

app/Services/WorkOrderInterceptService.php

@@ -33,7 +33,9 @@ class WorkOrderInterceptService extends WorkOrderService
             $commoditiesService,
             $detailService,
             $issueTypeService,
-            $orderService, $orderIssueService, $orderIssueProcessLogService);
+            $orderService,
+            $orderIssueService,
+            $orderIssueProcessLogService);
     }
 
     public function checkWorkOrder($nos)
@@ -75,9 +77,10 @@ class WorkOrderInterceptService extends WorkOrderService
         $order = $this->syncOrder($params['order_no']);
         $work_order = $this->createAndNotification($order, $issueType, $params['remark'] ?? '拦截工单');
         $detail = $this->detailService->createWorkOrderDetail($work_order, $params);
+        $process_progress = '商家创建';
         $work_order->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_tag' => WorkOrder::$NEW_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
@@ -88,14 +91,14 @@ class WorkOrderInterceptService extends WorkOrderService
         $detail->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'logistic_handle_tag' => 0,
         ]);
         $detail->processLogs()->create([
             'work_order_id' => $work_order->id,
             'work_order_detail_id' => $detail->id,
             'user_id' => $work_order->creator_id,
-            'content' => '创建-拦截工单',
+            'content' => $process_progress.'-拦截',
             'status' => '未同步',
             'type' => '创建',
         ]);
@@ -121,15 +124,16 @@ class WorkOrderInterceptService extends WorkOrderService
     public function logisticHandler(WorkOrderDetail $detail, $params)
     {
         $detail->cancelLogisticTagHandle();         // 取消承运商处理标记
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'logistic_handle_tag' => 0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
@@ -140,11 +144,11 @@ class WorkOrderInterceptService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '处理-拦截工单',
+            'content' => $process_progress,
             'status' => '未同步',
             'type' => '处理',
         ]);
-        $this->logService->createLog($detail, '处理', '承运商处理-' . $params['process_progress']);
+        $this->logService->createLog($detail, '处理', '承运商处理-' . $process_progress);
     }
 
     /**
@@ -166,16 +170,16 @@ class WorkOrderInterceptService extends WorkOrderService
      */
     public function baoShiReviewIntercept(WorkOrderDetail $detail, $params)
     {
-
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'logistic_handle_tag' => 0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
@@ -193,7 +197,7 @@ class WorkOrderInterceptService extends WorkOrderService
         ]);
 
         $this->endOrderIssueAndSyncProcessLogs($detail);
-        $this->logService->createLog($detail, '终审', '宝时终审-' . $params['process_progress']);
+        $this->logService->createLog($detail, '终审', '宝时终审-' . $process_progress);
     }
 
     /**
@@ -239,12 +243,12 @@ class WorkOrderInterceptService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => $workOrder->creator_id,
-            'content' => '完结-拦截工单',
+            'content' => $process_progress.'-完结',
             'status' => '未同步',
             'type' => '结束',
         ]);
         $this->endOrderIssueAndSyncProcessLogs($detail);
-        $this->logService->createLog($detail, '终审', '自动终审' . $process_progress);
+        $this->logService->createLog($detail, '终审', '自动终审-' . $process_progress);
     }
 
 }

app/Services/WorkOrderLossService.php

@@ -21,10 +21,12 @@ class WorkOrderLossService extends WorkOrderService
         WorkOrderCommoditiesService $commoditiesService,
         WorkOrderDetailService $detailService,
         OrderIssueTypeService $issueTypeService,
-        OrderService $orderService
+        OrderService $orderService,
+        OrderIssueService $orderIssueService,
+        OrderIssueProcessLogService $orderIssueProcessLogService
     )
     {
-        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService);
+        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService,$orderIssueService,$orderIssueProcessLogService);
     }
 
     public function checkWorkOrder($nos)
@@ -49,32 +51,41 @@ class WorkOrderLossService extends WorkOrderService
     public function store($params)
     {
         $orderIssueType = $this->issueTypeService->firstOrCreate(['name' => '快递丢件']);
+
         $order = $this->syncOrder($params['order_no']);
+
         $work_order = $this->createAndNotification($order, $orderIssueType, $params['remark'] ?? '','宝时创建');
+
+        $process_progress = '宝时创建';
+
         $work_order->update([
             'status'=> WorkOrder::$OWNER_HANDLER_STATUS,
-            'process_progress' => '宝时创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'owner_tag' => WorkOrder::$NEW_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
         ]);
+
         $detail = $this->detailService->createWorkOrderDetail($work_order, $params);
+
         $detail->update([
             'status'=> WorkOrder::$OWNER_HANDLER_STATUS,
-            'process_progress' => '宝时创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'work_order_status' => 0,
             'logistic_handle_tag' =>0,
         ]);
+
         $detail->processLogs()->create([
             'work_order_id' => $work_order->id,
             'work_order_detail_id' => $detail->id,
             'user_id' => $work_order->creator_id,
-            'content' => '创建-快递丢件工单',
+            'content' => $process_progress.'-快递丢件',
             'status' => '未同步',
             'type' => '创建',
         ]);
+
         $this->logService->createLog($detail, '创建', '创建工单');
     }
 
@@ -86,15 +97,16 @@ class WorkOrderLossService extends WorkOrderService
     public function ownerFillDetail(WorkOrderDetail $detail,$params)
     {
         $this->detailService->fillLossDetail($detail, $params);
+        $process_progress = '待终审';
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => '待终审',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
             'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => '待终审',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
@@ -105,11 +117,11 @@ class WorkOrderLossService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '创建-快递丢件工单',
+            'content' => $process_progress.'-填充丢件信息',
             'status' => '未同步',
-            'type' => '创建',
+            'type' => '处理',
         ]);
-        $this->logService->createLog($detail, '处理', '待终审'.'-填充丢件信息');
+        $this->logService->createLog($detail, '处理', $process_progress.'-填充丢件信息');
     }
 
     /**
@@ -140,11 +152,11 @@ class WorkOrderLossService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '完结-快递丢件工单',
+            'content' => $process_progress.'-完结',
             'status' => '未同步',
             'type' => '结束',
         ]);
         $this->endOrderIssueAndSyncProcessLogs($detail);
-        $this->logService->createLog($detail, '终审', '终审完成'.'-宝时终审');
+        $this->logService->createLog($detail, '终审', $process_progress.'-宝时终审');
     }
 }

app/Services/WorkOrderMistakeService.php

@@ -54,9 +54,10 @@ class WorkOrderMistakeService extends WorkOrderService
         $order = $this->syncOrder($params['order_no']);
         $work_order = $this->createAndNotification($order, $issueType, $params['remark'] ?? '', '商家已创建');
         $detail = $this->detailService->createWorkOrderDetail($work_order, $params);
+        $process_progress = '商家创建';
         $work_order->update([
             'status'=> WorkOrder::$BAO_SHI_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'bao_shi_tag' => WorkOrder::$NEW_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
@@ -65,14 +66,14 @@ class WorkOrderMistakeService extends WorkOrderService
         ]);
         $detail->update([
             'status'=> WorkOrder::$BAO_SHI_HANDLER_STATUS,
-            'process_progress' => '商家创建',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
         ]);
         $detail->processLogs()->create([
             'work_order_id' => $work_order->id,
             'work_order_detail_id' => $detail->id,
             'user_id' => $work_order->creator_id,
-            'content' => '创建-错漏发工单',
+            'content' => $process_progress.'-错漏发',
             'status' => '未同步',
             'type' => '创建',
         ]);
@@ -87,15 +88,16 @@ class WorkOrderMistakeService extends WorkOrderService
     public function ownerEdit(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_HANDLER_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_HANDLER_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'work_order_status' => 0,
         ]);
@@ -103,7 +105,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '处理-错漏发工单',
+            'content' => $process_progress,
             'status' => '未同步',
             'type' => '处理',
         ]);
@@ -118,15 +120,16 @@ class WorkOrderMistakeService extends WorkOrderService
     public function baoShiCheckMistake(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress = '已核实';
         $detail->update([
             'status' => WorkOrder::$OWNER_HANDLER_STATUS,
-            'process_progress' => '已核实',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_HANDLER_STATUS,
             'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$OWNER_HANDLER_STATUS,
-            'process_progress' => '已核实',
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_HANDLER_STATUS,
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
@@ -137,7 +140,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '宝时校验-错漏发工单',
+            'content' => $process_progress,
             'status' => '未同步',
             'type' => '处理',
         ]);
@@ -152,33 +155,30 @@ class WorkOrderMistakeService extends WorkOrderService
     public function ownerReview(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
-
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
             'logistic_handle_tag' =>0,
         ]);
-
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'work_order_status' => 0,
         ]);
-
         $detail->processLogs()->create([
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '货主复核-错漏发工单',
+            'content' => $process_progress,
             'status' => '未同步',
             'type' => '处理',
         ]);
-
         $this->logService->createLog($detail, '处理', $params['process_progress'].'-货主处理');
     }
 
@@ -190,16 +190,16 @@ class WorkOrderMistakeService extends WorkOrderService
     public function ownerEditReview(WorkOrderDetail $detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
-
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
             'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
             'work_order_status' => 0,
         ]);
@@ -207,7 +207,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '货主重复核-错漏发工单',
+            'content' => $process_progress,
             'status' => '未同步',
             'type' => '处理',
         ]);
@@ -222,16 +222,17 @@ class WorkOrderMistakeService extends WorkOrderService
     public function baoShiReview($detail, $params)
     {
         $this->detailService->updateDetail($detail, $params);
+        $process_progress = $params['process_progress'];
         $detail->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'logistic_handle_tag' =>0,
         ]);
 
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
-            'process_progress' => $params['process_progress'],
+            'process_progress' => $process_progress,
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
@@ -243,7 +244,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'work_order_id' => $detail->work_order_id,
             'work_order_detail_id' => $detail->id,
             'user_id' => Auth::id(),
-            'content' => '宝时完结-错漏发工单',
+            'content' => $process_progress.'-完结',
             'status' => '未同步',
             'type' => '结束',
         ]);

app/Services/WorkOrderService.php

@@ -290,7 +290,7 @@ class WorkOrderService
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '承运商处理中',
             'last_status' => $last_status,
-            'logistic_handle_tag' =>1,
+            'logistic_handle_tag' => 1,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
@@ -301,6 +301,14 @@ class WorkOrderService
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
             'work_order_status' => WorkOrder::$DEFAULT_TAG,
         ]);
+        $detail->processLogs()->create([
+            'work_order_id' => $detail->work_order_id,
+            'work_order_detail_id' => $detail->id,
+            'user_id' => Auth::id(),
+            'content' => '承运商标记在处理',
+            'status' => '未同步',
+            'type' => '处理',
+        ]);
         app(WorkOrderLogService::class)->createLog($detail, '处理', '标记处理中');
     }
 
@@ -362,8 +370,6 @@ class WorkOrderService
                 'imported_status' => '正常',
                 'order_issue_type_id' => $detail->order_issue_type_id,
             ]);
-            OrderIssueProcessLog::query()
-                ->create(['order_issue_id' => $order_issue->id, 'content' => '创建', 'user_id' => Auth::id(), 'type' => '创建','created_at' => $detail->workOrder->created_at]);
         }
         $process_logs = $detail->processLogs()->where('status', '未同步')->get();
         $order_issue->logs()->insert($process_logs->map((function ($process_log) use ($order_issue) {
@@ -373,8 +379,10 @@ class WorkOrderService
                 'content' => $process_log->content,
                 'created_at' => $process_log->created_at,
                 'updated_at' => $process_log->updated_at,
+                'type' => $process_log->type,
             ];
         }))->toArray());
+        $this->orderIssueService->endOrderIssues([$order_issue->id]);
         $detail->processLogs()->where('status', '未同步')->update(['status' => '同步']);
     }
 

resources/views/order/workOrder/_logistic_fill_work_order_modal.blade.php

@@ -125,7 +125,7 @@
 
     <div slot="footer" class="dialog-footer">
         <el-button @click="dialogShowLogisticVisible = false">关 闭</el-button>
-        <el-button type="primary" @click="logisticEdit" v-show="'破损' === logisticEditWorkOrder.issue_type_name && logisticCheckDamage" disabled>提交</el-button>
+        <el-button type="primary" @click="logisticEdit" v-show="'破损' === logisticEditWorkOrder.issue_type_name && logisticCheckDamage()">提交</el-button>
         <el-button type="primary" @click="logisticEdit" v-show="'破损' !== logisticEditWorkOrder.issue_type_name">提交</el-button>
     </div>
 </el-dialog>

resources/views/order/workOrder/index.blade.php

@@ -1782,7 +1782,8 @@
                 },
                 logisticCheckDamage() {
                     let {commodities} = this.logisticEditWorkOrder;
-                    return commodities.filter(e => Number(e.price) === 0).length > 0;
+                    commodities.forEach(e =>console.log(Number(e.price) === 0));
+                    return commodities.filter(e => Number(e.price) === 0).length === 0;
                 },
                 logisticEdit() {
                     let {issue_type_name, commodities, detail_id, process_progress} = this.logisticEditWorkOrder;
@@ -1810,7 +1811,7 @@
                             this.errorTempTip(res.message);
                             return;
                         }
-                        if (this.logisticCheckDamage(0)) {
+                        if (!this.logisticCheckDamage()) {
                             this.errorTempTip('破损商待补充，工单暂不可修改');
                             return;
                         }
@@ -2801,7 +2802,6 @@
                 },
                 isStrandWorkOrder(item) {
                     let {logistic_tag, bao_shi_tag, owner_tag} = item;
-                    console.log(this.isLogistic);
                     if (this.isBaoShi) {
                         return `${bao_shi_tag}` === '2'
                     } else if (this.isLogistic) {