快递处理

app/Http/Controllers/WorkOrderController.php

@@ -111,6 +111,11 @@ class WorkOrderController extends Controller
         return ['success' => true, 'data' => $workOrders];
     }
 
+    /**
+     * 删除工单
+     * @param $id
+     * @return array|bool[]
+     */
     public function destroyApi($id): array
     {
         if (Gate::denies('订单管理-工单处理-删除'))
@@ -130,7 +135,11 @@ class WorkOrderController extends Controller
         return ['success' => true];
     }
 
-
+    /**
+     * 校验工单是否存在
+     * @param Request $request
+     * @return array
+     */
     public function checkWorkOrderApi(Request $request): array
     {
         $nos = $request->input('no','');

app/Services/WorkOrderCancelInterceptService.php

@@ -8,21 +8,17 @@ use App\WorkOrderDetail;
 
 class WorkOrderCancelInterceptService extends WorkOrderService
 {
-    /**
-     * @var WorkOrderLogService $logService
-     * @var WorkOrderDetailService $detailService
-     * @var OrderIssueTypeService $issueTypeService
-     */
-    private $logService;
-    private $detailService;
-    private $issueTypeService;
 
-    public function __construct()
+    public function __construct(
+        WorkOrderLogService $logService,
+        WorkOrderImageService $imageService,
+        WorkOrderCommoditiesService $commoditiesService,
+        WorkOrderDetailService $detailService,
+        OrderIssueTypeService $issueTypeService,
+        OrderService $orderService
+    )
     {
-        parent::__construct();
-        $this->logService = app('WorkOrderLogService');
-        $this->detailService = app('WorkOrderDetailService');
-        $this->issueTypeService = app('OrderIssueTypeService');
+        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService);
     }
 
     public function checkWorkOrder($nos)
@@ -59,12 +55,14 @@ class WorkOrderCancelInterceptService extends WorkOrderService
             'logistic_tag' => WorkOrder::$NEW_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $detail = $this->detailService->createWorkOrderDetail($workOrder, $params);
         $detail->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '商家创建',
             'last_status' => WorkOrder::$DEFAULT_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $this->logService->createLog($detail, '创建', '创建工单');
     }
@@ -88,6 +86,7 @@ class WorkOrderCancelInterceptService extends WorkOrderService
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'process_progress' => $params['process_progress'],
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
 
         $detail->workOrder()->update([
@@ -97,6 +96,7 @@ class WorkOrderCancelInterceptService extends WorkOrderService
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->syncOrderIssueProcessLogs($detail);
         $this->logService->createLog($detail, '处理', $params['process_progress'].'-承运商处理');
@@ -126,6 +126,7 @@ class WorkOrderCancelInterceptService extends WorkOrderService
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
             'process_progress' => $params['process_progress'],
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
@@ -134,6 +135,7 @@ class WorkOrderCancelInterceptService extends WorkOrderService
             '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'].'-宝时终审');
     }

app/Services/WorkOrderDamageService.php

@@ -13,21 +13,22 @@ use App\WorkOrderDetail;
  */
 class WorkOrderDamageService extends WorkOrderService
 {
-    /**
-     * @var WorkOrderLogService $logService
-     * @var WorkOrderDetailService $detailService
-     * @var OrderIssueTypeService $issueTypeService
-     */
-    private $logService;
-    private $detailService;
-    private $issueTypeService;
-
-    public function __construct()
+    public function __construct(
+        WorkOrderLogService $logService,
+        WorkOrderImageService $imageService,
+        WorkOrderCommoditiesService $commoditiesService,
+        WorkOrderDetailService $detailService,
+        OrderIssueTypeService $issueTypeService,
+        OrderService $orderService
+    )
     {
-        parent::__construct();
-        $this->logService = app('WorkOrderLogService');
-        $this->detailService = app('WorkOrderDetailService');
-        $this->issueTypeService = app('OrderIssueTypeService');
+        parent::__construct($logService,
+            $imageService,
+            $commoditiesService,
+            $detailService,
+            $issueTypeService,
+            $orderService
+        );
     }
 
     public function checkWorkOrder($nos)
@@ -66,6 +67,8 @@ class WorkOrderDamageService extends WorkOrderService
             'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '商家创建',
             'last_status' => WorkOrder::$DEFAULT_STATUS,
+            'work_order_status' => 0,
+            'logistic_handle_tag' =>0,
         ]);
         $this->logService->createLog($detail, '创建', '创建工单');
     }
@@ -82,11 +85,13 @@ class WorkOrderDamageService extends WorkOrderService
             'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '商家创建',
             'last_status' => WorkOrder::$DEFAULT_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '商家创建',
             'last_status' => WorkOrder::$DEFAULT_STATUS,
+            'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '处理', '货主编辑');
 
@@ -105,6 +110,7 @@ class WorkOrderDamageService extends WorkOrderService
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'process_progress' => $params['process_progress'],
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
 
         $detail->workOrder()->update([
@@ -114,6 +120,7 @@ class WorkOrderDamageService extends WorkOrderService
             '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'].'-承运商处理');
@@ -131,6 +138,7 @@ class WorkOrderDamageService extends WorkOrderService
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
             'process_progress' => $params['process_progress'],
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
 
         $detail->workOrder()->update([
@@ -140,6 +148,7 @@ class WorkOrderDamageService extends WorkOrderService
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->syncOrderIssueProcessLogs($detail);
         $this->logService->createLog($detail, '终审', $params['process_progress'].'-宝时终审');

app/Services/WorkOrderExpressAbnormalService.php

@@ -12,22 +12,17 @@ use App\WorkOrderDetail;
 
 class WorkOrderExpressAbnormalService extends WorkOrderService
 {
-    /**
-     * @var WorkOrderLogService $logService
-     * @var WorkOrderDetailService $detailService
-     * @var OrderIssueTypeService $issueTypeService
-     * @var OrderService $orderService
-     */
-    private $logService;
-    private $detailService;
-    private $issueTypeService;
 
-    public function __construct()
+    public function __construct(
+        WorkOrderLogService $logService,
+        WorkOrderImageService $imageService,
+        WorkOrderCommoditiesService $commoditiesService,
+        WorkOrderDetailService $detailService,
+        OrderIssueTypeService $issueTypeService,
+        OrderService $orderService
+    )
     {
-        parent::__construct();
-        $this->logService = app('WorkOrderLogService');
-        $this->detailService = app('WorkOrderDetailService');
-        $this->issueTypeService = app('OrderIssueTypeService');
+        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService);
     }
 
     public function checkWorkOrder($nos)
@@ -69,7 +64,8 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
         $detail->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '商家创建',
-            'last_status' => WorkOrder::$DEFAULT_STATUS
+            'last_status' => WorkOrder::$DEFAULT_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $this->logService->createLog($detail, '创建', '创建工单');
     }
@@ -83,11 +79,11 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
     {
         $this->detailService->updateDetail($detail, $params);
 
-        $detail->workOrder()->update([
-                'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
-                'process_progress' => '商家创建',
-                'last_status' => WorkOrder::$DEFAULT_STATUS,]
-        );
+        $detail->update([
+            'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
+            'process_progress' => '商家创建',
+            'last_status' => WorkOrder::$DEFAULT_STATUS,
+        ]);
 
         $detail->workOrder()->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,

app/Services/WorkOrderInformationChangeService.php

@@ -13,21 +13,17 @@ use App\WorkOrderDetail;
  */
 class WorkOrderInformationChangeService extends WorkOrderService
 {
-    /**
-     * @var WorkOrderLogService $logService
-     * @var WorkOrderDetailService $detailService
-     * @var OrderIssueTypeService $issueTypeService
-     */
-    private $logService;
-    private $detailService;
-    private $issueTypeService;
-
-    public function __construct()
+    public function __construct(
+        WorkOrderLogService $logService,
+        WorkOrderImageService $imageService,
+        WorkOrderCommoditiesService $commoditiesService,
+        WorkOrderDetailService $detailService,
+        OrderIssueTypeService $issueTypeService,
+        OrderService $orderService
+    )
     {
-        parent::__construct();
-        $this->logService = app('WorkOrderLogService');
-        $this->detailService = app('WorkOrderDetailService');
-        $this->issueTypeService = app('OrderIssueTypeService');
+        parent::__construct($logService, $imageService, $commoditiesService, $detailService, $issueTypeService, $orderService);
+
     }
 
     public function checkWorkOrder($nos)
@@ -60,7 +56,7 @@ class WorkOrderInformationChangeService extends WorkOrderService
         $workOrder = $this->createAndNotification($order, $issueType, $params['remark'] ?? '');
 
         $workOrder->update([
-            'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
+            'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '商家创建',
             'last_status' => WorkOrder::$DEFAULT_STATUS,
             'logistic_tag' => WorkOrder::$NEW_TAG,
@@ -71,7 +67,7 @@ class WorkOrderInformationChangeService extends WorkOrderService
         $detail = $this->detailService->createWorkOrderDetail($workOrder, $params);
 
         $detail->update([
-            'status'=> WorkOrder::$LOGISTIC_HANDLER_STATUS,
+            'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '商家创建',
             'last_status' => WorkOrder::$DEFAULT_STATUS,
         ]);
@@ -111,8 +107,9 @@ class WorkOrderInformationChangeService extends WorkOrderService
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
-        $this->logService->createLog($detail, '处理', '承运商处理-'.$params['process_progress']);
+        $this->logService->createLog($detail, '处理', '承运商处理-' . $params['process_progress']);
     }
 
     /**
@@ -146,10 +143,11 @@ class WorkOrderInformationChangeService extends WorkOrderService
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
 
         $this->syncOrderIssueProcessLogs($detail);
-        $this->logService->createLog($detail, '终审', '宝时终审-'.$params['process_progress']);
+        $this->logService->createLog($detail, '终审', '宝时终审-' . $params['process_progress']);
     }
 
     /**

app/Services/WorkOrderInterceptService.php

@@ -13,21 +13,23 @@ use App\WorkOrderDetail;
  */
 class WorkOrderInterceptService extends WorkOrderService
 {
-    /**
-     * @var WorkOrderLogService $logService
-     * @var WorkOrderDetailService $detailService
-     * @var OrderIssueTypeService $issueTypeService
-     */
-    private $logService;
-    private $detailService;
-    private $issueTypeService;
 
-    public function __construct()
+    public function __construct(
+        WorkOrderLogService $logService,
+        WorkOrderImageService $imageService,
+        WorkOrderCommoditiesService $commoditiesService,
+        WorkOrderDetailService $detailService,
+        OrderIssueTypeService $issueTypeService,
+        OrderService $orderService
+    )
     {
-        parent::__construct();
-        $this->logService = app('WorkOrderLogService');
-        $this->detailService = app('WorkOrderDetailService');
-        $this->issueTypeService = app('OrderIssueTypeService');
+        parent::__construct( $logService,
+             $imageService,
+             $commoditiesService,
+             $detailService,
+             $issueTypeService,
+             $orderService);
+
     }
 
     public function checkWorkOrder($nos)
@@ -68,9 +70,7 @@ class WorkOrderInterceptService extends WorkOrderService
         $issueType = $this->issueTypeService->firstOrCreate(['name' => '拦截']);
         $order = $this->syncOrder($params['order_no']);
         $workOrder = $this->createAndNotification($order, $issueType, $params['remark'] ?? '拦截工单');
-
         $detail = $this->detailService->createWorkOrderDetail($workOrder, $params);
-
         $workOrder->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '商家创建',
@@ -78,12 +78,14 @@ class WorkOrderInterceptService extends WorkOrderService
             'logistic_tag' => WorkOrder::$NEW_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
 
         $detail->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'last_status' => WorkOrder::$DEFAULT_STATUS,
-            'process_progress' => '商家创建'
+            'process_progress' => '商家创建',
+            'logistic_handle_tag' =>0,
         ]);
         $this->logService->createLog($detail, '创建', '创建');
     }
@@ -111,6 +113,7 @@ class WorkOrderInterceptService extends WorkOrderService
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'process_progress' => $params['process_progress'],
             'last_status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
@@ -119,6 +122,7 @@ class WorkOrderInterceptService extends WorkOrderService
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
+            'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '处理', '承运商处理-' . $params['process_progress']);
     }
@@ -146,6 +150,7 @@ class WorkOrderInterceptService extends WorkOrderService
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
             'process_progress' => $params['process_progress'],
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
@@ -154,6 +159,7 @@ class WorkOrderInterceptService extends WorkOrderService
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->syncOrderIssueProcessLogs($detail);
         $this->logService->createLog($detail, '终审', '宝时终审-' . $params['process_progress']);
@@ -187,6 +193,7 @@ class WorkOrderInterceptService extends WorkOrderService
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
             '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,
@@ -195,6 +202,7 @@ class WorkOrderInterceptService extends WorkOrderService
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '终审', '自动终审' . $process_progress);
     }

app/Services/WorkOrderLossService.php

@@ -14,22 +14,16 @@ use App\WorkOrderDetail;
  */
 class WorkOrderLossService extends WorkOrderService
 {
-
-    /**
-     * @var WorkOrderLogService $logService
-     * @var WorkOrderDetailService $detailService
-     * @var OrderIssueTypeService $issueTypeService
-     */
-    private $logService;
-    private $detailService;
-    private $issueTypeService;
-
-    public function __construct()
+    public function __construct(
+        WorkOrderLogService $logService,
+        WorkOrderImageService $imageService,
+        WorkOrderCommoditiesService $commoditiesService,
+        WorkOrderDetailService $detailService,
+        OrderIssueTypeService $issueTypeService,
+        OrderService $orderService
+    )
     {
-        parent::__construct();
-        $this->logService = app('WorkOrderLogService');
-        $this->detailService = app('WorkOrderDetailService');
-        $this->issueTypeService = app('OrderIssueTypeService');
+        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService);
     }
 
     public function checkWorkOrder($nos)
@@ -69,6 +63,8 @@ class WorkOrderLossService extends WorkOrderService
             'status'=> WorkOrder::$OWNER_HANDLER_STATUS,
             'process_progress' => '宝时创建',
             'last_status' => WorkOrder::$DEFAULT_STATUS,
+            'work_order_status' => 0,
+            'logistic_handle_tag' =>0,
         ]);
         $this->logService->createLog($detail, '创建', '创建工单');
     }
@@ -85,6 +81,7 @@ class WorkOrderLossService extends WorkOrderService
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'process_progress' => '待终审',
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
@@ -93,6 +90,7 @@ class WorkOrderLossService extends WorkOrderService
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '处理', '待终审'.'-填充丢件信息');
     }
@@ -110,6 +108,7 @@ class WorkOrderLossService extends WorkOrderService
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
             '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,
@@ -118,6 +117,7 @@ class WorkOrderLossService extends WorkOrderService
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->syncOrderIssueProcessLogs($detail);
         $this->logService->createLog($detail, '终审', '终审完成'.'-宝时终审');

app/Services/WorkOrderMistakeService.php

@@ -13,22 +13,16 @@ use App\WorkOrderDetail;
  */
 class WorkOrderMistakeService extends WorkOrderService
 {
-    /**
-     * @var WorkOrderLogService $logService
-     * @var WorkOrderDetailService $detailService
-     * @var OrderIssueTypeService $issueTypeService
-     * @var WorkOrderService $workOrderService
-     */
-    private $logService;
-    private $detailService;
-    private $issueTypeService;
-
-    public function __construct()
+    public function __construct(
+        WorkOrderLogService $logService,
+        WorkOrderImageService $imageService,
+        WorkOrderCommoditiesService $commoditiesService,
+        WorkOrderDetailService $detailService,
+        OrderIssueTypeService $issueTypeService,
+        OrderService $orderService
+    )
     {
-        parent::__construct();
-        $this->logService = app('WorkOrderLogService');
-        $this->detailService = app('WorkOrderDetailService');
-        $this->issueTypeService = app('OrderIssueTypeService');
+        parent::__construct($logService,$imageService,$commoditiesService,$detailService,$issueTypeService,$orderService);
     }
 
     public function checkWorkOrder($nos)
@@ -62,6 +56,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'bao_shi_tag' => WorkOrder::$NEW_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
+            'logistic_handle_tag' =>0,
         ]);
         $detail->update([
             'status'=> WorkOrder::$BAO_SHI_HANDLER_STATUS,
@@ -83,11 +78,13 @@ class WorkOrderMistakeService extends WorkOrderService
             'status' => WorkOrder::$BAO_SHI_HANDLER_STATUS,
             'process_progress' => $params['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'],
             'last_status' => WorkOrder::$DEFAULT_STATUS,
+            'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '处理', '商家修改');
     }
@@ -104,6 +101,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'status' => WorkOrder::$OWNER_HANDLER_STATUS,
             'process_progress' => '已核实',
             'last_status' => WorkOrder::$BAO_SHI_HANDLER_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$OWNER_HANDLER_STATUS,
@@ -112,6 +110,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '处理', '已核实'.'-宝时处理');
     }
@@ -129,6 +128,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'process_progress' => $params['process_progress'],
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
 
         $detail->workOrder()->update([
@@ -138,6 +138,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'bao_shi_tag' => WorkOrder::$STRAND_TAG,
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
 
         $this->logService->createLog($detail, '处理', $params['process_progress'].'-货主处理');
@@ -156,11 +157,13 @@ class WorkOrderMistakeService extends WorkOrderService
             'status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
             'process_progress' => $params['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'],
             'last_status' => WorkOrder::$OWNER_HANDLER_STATUS,
+            'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '处理', $params['process_progress'].'-货主编辑');
     }
@@ -177,6 +180,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
             'process_progress' => $params['process_progress'],
             'last_status' => WorkOrder::$BAO_SHI_REVIEW_STATUS,
+            'logistic_handle_tag' =>0,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$TO_BO_OWNER_END_STATUS,
@@ -185,6 +189,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'owner_tag' => WorkOrder::$STRAND_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->syncOrderIssueProcessLogs($detail);
         $this->logService->createLog($detail, '终审', $params['process_progress'].'-宝时终审');

app/Services/WorkOrderService.php

@@ -7,7 +7,6 @@ use App\OrderIssueProcessLog;
 use App\OrderIssueRejectedBill;
 use App\OrderIssueType;
 use App\OrderPackage;
-use App\Traits\ModelLogChanging;
 use App\Traits\ServiceAppAop;
 use App\WorkOrder;
 use App\WorkOrderDetail;
@@ -19,21 +18,28 @@ class WorkOrderService
 
     protected $modelClass = WorkOrder::class;
 
-    private $logService;
-    private $imageService;
-    private $commoditiesService;
-    private $detailService;
-    private $issueTypeService;
-    private $orderService;
-
-    public function __construct()
+    public $logService;
+    public $imageService;
+    public $commoditiesService;
+    public $detailService;
+    public $issueTypeService;
+    public $orderService;
+
+    public function __construct(
+        WorkOrderLogService $logService,
+        WorkOrderImageService $imageService,
+        WorkOrderCommoditiesService $commoditiesService,
+        WorkOrderDetailService $detailService,
+        OrderIssueTypeService $issueTypeService,
+        OrderService $orderService
+    )
     {
-        $this->logService = app(WorkOrderLogService::class);
-        $this->imageService = app(WorkOrderImageService::class);
-        $this->commoditiesService = app(WorkOrderCommoditiesService::class);
-        $this->detailService = app(WorkOrderDetailService::class);
-        $this->issueTypeService = app(OrderIssueTypeService::class);
-        $this->orderService = app(OrderService::class);
+        $this->logService = $logService;
+        $this->imageService = $imageService;
+        $this->commoditiesService = $commoditiesService;
+        $this->detailService = $detailService;
+        $this->issueTypeService = $issueTypeService;
+        $this->orderService = $orderService;
     }
 
     public function createOrResetWorkOrder($order, $issueType, $remark, $process_progress = '商家创建')
@@ -46,7 +52,6 @@ class WorkOrderService
                 'order_issue_type_id' => $issueType->id,
                 'creator_id' => Auth::id() ?? '',
                 'status' => WorkOrder::$DEFAULT_STATUS,
-                'work_order_status' => 1,
                 'process_progress' => $process_progress,
                 'type' => $process_progress,
                 'last_handler_id' => Auth::id() ?? '',
@@ -64,7 +69,6 @@ class WorkOrderService
             'order_issue_type_id' => $issueType->id,
             'uniquely_tag' => $order->code,
             'status' => WorkOrder::$DEFAULT_STATUS,
-            'work_order_status' => 1,
             'process_progress' => $process_progress,
             'type' => $process_progress,
             'last_handler_id' => Auth::id() ?? '',
@@ -92,6 +96,7 @@ class WorkOrderService
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '完结', '完结工单');
     }
@@ -102,7 +107,6 @@ class WorkOrderService
      */
     public function ownerEndWorkOrderDetail(WorkOrderDetail $detail)
     {
-
         $detail->update([
             'status' => WorkOrder::$END_STATUS,
             'process_progress' => '完成',
@@ -115,6 +119,7 @@ class WorkOrderService
             'owner_tag' => WorkOrder::$DEFAULT_TAG,
             'logistic_tag' => WorkOrder::$DEFAULT_TAG,
             'bao_shi_tag' => WorkOrder::$DEFAULT_TAG,
+            'work_order_status' => 0,
         ]);
         $this->detailService->endDetail($detail);                       // 标记为处理过
         $this->logService->createLog($detail, '完结', '货主完结');
@@ -279,6 +284,7 @@ class WorkOrderService
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,
             'process_progress' => '承运商处理中',
             'last_status' => $last_status,
+            'logistic_handle_tag' =>1,
         ]);
         $detail->workOrder()->update([
             'status' => WorkOrder::$LOGISTIC_HANDLER_STATUS,

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

@@ -807,7 +807,7 @@
                         return new Date(prev.created_at) > new Date(curr.created_at);
                     });
                     if (!details) return null;
-                    let detail = details.find(e => true);
+                    let detail = details.find(e => `${workOrder.order_issue_type_id}` === `${e.order_issue_type_id}`);
                     return {
                         id: workOrder.id,
                         detail_id: detail ? detail.id : '',