相关方法修改

app/Http/Controllers/WorkOrderController.php

@@ -223,7 +223,6 @@ class WorkOrderController extends Controller
         return ['success' => true,'data' => $workOrder];
     }
 
-
     public function updateLossApi(Request $request): array
     {
         if (Gate::denies('订单管理-工单处理-货主编辑'))
@@ -326,14 +325,13 @@ class WorkOrderController extends Controller
 
         $this->commoditiesService->updateWorkOrderCommoditiesByJsonArray($workOrder, $request->input('commodities'));
 
-        $workOrder->loadDefaultWith();
-
-        $issueType = $workOrder->issueType->name ?? '';
-        if($issueType == '丢件'){
+        if(($workOrder->issueType->name ?? '') == '快递丢件'){
             $this->logService->createLog($workOrder,'处理','货主填充数据');
             $workOrder->changeStatus('宝时处理');
         }
 
+        $workOrder->loadDefaultWith();
+
         return ['success' => true, 'data' => $workOrder];
     }
 
@@ -350,12 +348,16 @@ class WorkOrderController extends Controller
 
         $workOrder->loadDefaultWith();
         $issueType = $workOrder->issueType->name ?? '';
-        if (in_array($issueType,['快递异常','快递丢件','破损'])){
-            $workOrder->changeStatus('完成');
+        if (in_array($issueType,['破损','快递异常','快递丢件'])){
+            $workOrder->changeStatus('宝时终审');
             $this->logService->createLog($workOrder,'处理','承运商处理');
+
+        } else if (in_array($issueType,['拦截','信息更改'])){
+            $workOrder->changeStatus('完成');
             $this->logService->createLog($workOrder,'完结','承运商完成');
         }
 
+
         return ['success' => true, 'data' => $workOrder];
     }
 
@@ -396,6 +398,20 @@ class WorkOrderController extends Controller
         return ['success' => true, 'data' => $workOrder];
     }
 
+    public function baoShiReviewApi(Request $request): array
+    {
+        if (Gate::denies('订单管理-工单处理-客服编辑')) {
+            return ['success' => false, 'message' => '没有对应权限'];
+        }
+        $workOrder = $this->service->find($request->input('id'));
+
+        $this->service->baoShiReview($workOrder,$request->input('commodities'));
+
+        $workOrder->loadDefaultWith();
+
+        return ['success' => true,'data' => $workOrder];
+    }
+
     public function checkWorkOrderApi(Request $request): array
     {
         $nos = $request->input('no','');

app/Services/WorkOrderCommoditiesService.php

@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Commodity;
 use App\Traits\ServiceAppAop;
 use App\WorkOrder;
 use App\WorkOrderCommodities;
@@ -23,6 +22,7 @@ class WorkOrderCommoditiesService
             'logistic_number' => $obj->logistic_number ?? '',
             'abnormal_amount' => $obj->abnormal_amount ?? '',
             'check_amount' => $obj->check_amount ?? '',
+            'bao_shi_check_amount' => $obj->bao_shi_check_amount ?? '',
             'check_result' => $obj->check_result ?? '',
             'process_result' => $commodity->process_result ?? '',
         ]);
@@ -52,6 +52,7 @@ class WorkOrderCommoditiesService
         $obj = json_decode($json);
         $workOrder->commodities()->where('id', $obj->id)->update([
             'check_amount' => $obj->check_amount ?? '',
+            'bao_shi_check_amount' => $obj->bao_shi_check_amount ?? '',
             'check_result' => $obj->check_result ?? '',
             'process_result' => $obj->process_result ?? '',
         ]);

app/Services/WorkOrderService.php

@@ -307,6 +307,17 @@ class WorkOrderService
         return ['success' => true, 'data' => $workOrders->first()];
     }
 
+    public function baoShiReview(WorkOrder $workOrder,$params)
+    {
+        $user = Auth::user();
+
+        $workOrder->update(['reviewer_id' => $user['id'], 'review_at' => Carbon::now(), 'status' => '5']);
+
+        $this->logService->createLog($workOrder,'终审','终审完成');
+
+        $this->commoditiesService->updateWorkOrderCommoditiesByJsonArray($workOrder,$params);
+    }
+
     /**
      * 批量审核工单
      * @param $workOrders

app/WorkOrder.php

@@ -46,7 +46,8 @@ class WorkOrder extends Model
             '宝时处理' => 1,
             '货主处理' => 2,
             '承运商处理' => 3,
-            '完成' => 4,
+            '宝时终审' => 4,
+            '完成' => 5,
         ],
 //        'work_order_status' => [
 //            '' => 0,

app/WorkOrderCommodities.php

@@ -13,17 +13,17 @@ class WorkOrderCommodities extends Model
     use ModelLogChanging;
     use ModelTimeFormat;
 
-    //
     protected $fillable = [
         'work_order_id',
         'commodity_id',
         'sku',
-        'logistic_number',  // 快递单号数量
-        'check_amount',     // 复核数量
-        'abnormal_amount',  // 异常数量
-        'amount',           // 订单数量
-        'check_result',     // 核实结果
-        'process_result',   // 处理结果
+        'logistic_number',      // 快递单号数量
+        'check_amount',         // 复核数量
+        'bao_shi_check_amount', // 宝时复核数量
+        'abnormal_amount',      // 异常数量
+        'amount',               // 订单数量
+        'check_result',         // 核实结果
+        'process_result',       // 处理结果
     ];
 
     public function workOrder(): BelongsTo

app/WorkOrderLog.php

@@ -19,7 +19,8 @@ class WorkOrderLog extends Model
             '' => 0,
             '创建' => 1,
             '处理' => 2,
-            '完结' => 3,
+            '终审' => 3,
+            '完结' => 4,
         ],
     ];