修改追踪件order_client_no和client的逻辑

app/Services/OrderTrackingService.php

@@ -63,11 +63,12 @@ class OrderTrackingService
         $query = $this->getQuery($params);
 
         if (isset($params['client_code'])|| isset($params['logistic_id'])){     // client_code logistic
-            $query->whereHas('commodities.package.order', function ($query) use ($params) {
-                if($params['client_code'] ?? false){
-                    $query->where('client_code','like', $params['client_code']);
-                }
-            });
+            $query->where('order_client_code','like',$params['client_code']);
+//            $query->whereHas('commodities.package.order', function ($query) use ($params) {
+//                if($params['client_code'] ?? false){
+//                    $query->where('client_code','like', $params['client_code']);
+//                }
+//            });
         }
 
         if(isset($params['logistic_id']))$query->where('logistic_id',$params['logistic_id']);   // 快递
@@ -207,9 +208,6 @@ class OrderTrackingService
         /** @var DataHandlerService $dataService */
         $dataService = app(DataHandlerService::class);
 
-        $owners = app(OwnerService::class)->getByWmsOrders($orderHeaders);
-        $owner_id_map = $basSKUs_data = $dataService->dataHeader(['id'],$owners);
-
         $BasSKUs = app(OracleBasSkuService::class)->获取BasSKu_通过WMSOrderHeaders($orderHeaders);
         $BasSKUs_code_sku_map = $dataService->dataHeader(['customerid','sku'],$BasSKUs);
         $order_nos = data_get($orderHeaders,'*.orderno');
@@ -245,38 +243,7 @@ class OrderTrackingService
             $order_header = $order_headers_map[$order->code];
             if(!$order_header){continue ;}
             if($order_header->sostatus == 90){continue;}
-
-            $web_order_number = null;
-            if(preg_match('/^O[\d]/',$order_header['soreference1'] ?? '') > 0){
-                $web_order_number = $order_header['soreference1'];
-            }
-            $param = $this->getParamsByOrderHeaderAndOrder($order_header,$order);
-            $owner = $dataService->getKeyValue(['id'=>$order->owner_id],$owner_id_map);
-            $basSkU = $dataService->getKeyValue(['customerid'=>$owner->code,'sku'=>$item->commodity->sku],$BasSKUs_code_sku_map);
-            $gross_weight = round($basSkU->grossweight * $item->amount, 2);
-            $bulk = round($basSkU->cube * $item->amount, 2);
-
-            $order_client_code = $order->client_code;
-            if($param['client']=='天猫'){
-                $order_client_code = $this->get_d_edit_03($order_header,$item) ;
-            }
-
-            $params[] =[
-                'order_package_commodity_id' => $item->id,
-                'owner_id' => $order->owner_id,
-                'logistic_id' => $param['logistic_id'],
-                'order_client_code' =>$order_client_code,
-                'sale' => $param['sale'],
-                'client' => $param['client'],
-                'created_at' => $order->created_at,
-                'order_remark' => $param['order_remark'],
-                'pick_up_at' => $order_header->lastshipmenttime, // 提货时间,
-                'web_order_number' => $web_order_number,
-                'gross_weight'=> $gross_weight,
-                'bulk'=> $bulk,
-                'is_on_duty_shift'=> $param['is_on_duty_shift'],
-                'planning_sent_at' => $param['planning_sent_at'] ?? ''
-            ];
+            $params[] = $this->getCreateParams($order_header,$order,$item,$BasSKUs_code_sku_map);
         }
         try {
             if (count($params) > 0) {
@@ -336,8 +303,6 @@ class OrderTrackingService
             $order_code_map[$order->code] = $order;
             $order_package_commodity_order_code_map[$order->code][] = $order_package_commodity;
         }
-        $owners = app(OwnerService::class)->getByWmsOrders($orderHeaders);
-        $owner_code_map = $basSKUs_data = $dataService->dataHeader(['code'],$owners);
 
         $BasSKUs = app(OracleBasSkuService::class)->获取BasSKu_通过WMSOrderHeaders($orderHeaders);
         $BasSKUs_code_sku_map = $dataService->dataHeader(['customerid','sku'],$BasSKUs);
@@ -347,7 +312,6 @@ class OrderTrackingService
         foreach ($orderHeaders as $orderHeader) {
             if($orderHeader->sostatus == '90'){continue;}
             $order_package_commodity_list = $order_package_commodity_order_code_map[$orderHeader->orderno] ?? false;
-
             if(!$order_package_commodity_list){continue;}
             $order = $order_code_map[$orderHeader->orderno];
 
@@ -355,34 +319,19 @@ class OrderTrackingService
                 $order_tracking = $order_tracking_id_map[$order_package_commodity->id]??false;
                 if(!$order_tracking){continue;}
 
-                $params = $this->getParamsByOrderHeaderAndOrder($orderHeader,$order);
-                $owner =  $dataService->getKeyValue(['code'=>$orderHeader->customerid],$owner_code_map);
-                $basSku = $dataService->getKeyValue(['customerid'=>$owner->code,'sku'=>$order_package_commodity->commodity->sku],$BasSKUs_code_sku_map);
-                $gross_weight = round($basSku->grossweight * $order_package_commodity->amount,2) ;
-                $bulk = round($basSku->cube * $order_package_commodity->amount,2);
-
-                $order_client_code = $order->client_code;
-                if($params['client']=='天猫'){
-                    $order_client_code = $this->get_d_edit_03($orderHeader,$order_package_commodity) ;
-                }
+                $params = $this->getCreateParams($orderHeader,$order,$order_package_commodity,$BasSKUs_code_sku_map);
+                $params['id'] = $order_tracking->id;
                 if($order_tracking->owner_id != $params['owner_id'] ||
                     $order_tracking->client !=$params['client'] ||
                     $order_tracking->order_remark != $params['order_remark'] ||
                     $order_tracking->pick_up_at != $params['pick_up_at'] ||
-                    $order_tracking->gross_weight != $gross_weight ||
-                    $order_tracking->bulk != $bulk ||
-                    $order_tracking->client != $order_client_code){
-                    $update_params[] = [
-                        'id' => $order_tracking->id,
-                        'client' => $params['client'],
-                        'order_client_code' => $order_client_code,
-                        'pick_up_at' => $params['pick_up_at'],
-                        'order_remark' => $params['order_remark'],
-                        'web_order_number' => $params['web_order_number'],
-                        'gross_weight'  => $gross_weight,
-                        'bulk' => $bulk,
-                        'planning_sent_at' => $params['planning_sent_at']
-                    ];
+                    $order_tracking->gross_weight != $params['gross_weight'] ||
+                    $order_tracking->bulk != $params['bulk'] ||
+                    $order_tracking->client != $params['client']
+                    || $order_tracking->order_client_code != $params['order_client_code']
+                ){
+                    $params['updated_at'] = Carbon::now();
+                    $update_params[] = $params;
                 }
             }
         }
@@ -391,22 +340,14 @@ class OrderTrackingService
         }
         $insert_params = [];
         foreach ($orderHeaders as $orderHeader) {
-            $order_package_commodity_list=  $order_package_commodity_order_code_map[$orderHeader->orderno] ?? false;
+            $order_package_commodity_list = $order_package_commodity_order_code_map[$orderHeader->orderno] ?? false;
             if(!$order_package_commodity_list)continue;
             foreach ($order_package_commodity_list as $item) {
-                $order_tracking =  $order_tracking_id_map[$item->id] ?? false;
+                $order_tracking = $order_tracking_id_map[$item->id] ?? false;
                 if(!$order_tracking){
                     $order = $order_code_map[$orderHeader->orderno] ?? false;
                     if(!$order) continue;
-                    $basSkU = $dataService->getKeyValue(['customerid'=>$orderHeader->customerid,'sku'=>$item->commodity->sku],$BasSKUs_code_sku_map);
-                    $gross_weight = round($basSkU->grossweight * $item->amount, 2);
-                    $bulk = round($basSkU->cube * $item->amount, 2);
-                    $param = $this->getParamsByOrderHeaderAndOrder($orderHeader,$order);
-                    $param['order_package_commodity_id'] =$item->id;
-                    $param['order_client_code'] = $order->client_code;
-                    $param['gross_weight'] = $gross_weight;
-                    $param['bulk'] = $bulk;
-                    $insert_params[] =$param;
+                    $insert_params[] = $this->getCreateParams($orderHeader,$order,$item,$BasSKUs_code_sku_map);
                 }
             }
         }
@@ -421,53 +362,6 @@ class OrderTrackingService
         $this->删除订单追踪_订单取消($orderHeaders);
     }
 
-    /**
-     * @param OracleDOCOrderHeader $orderHeader
-     * @param Order $order
-     * @return array
-     */
-    public function getParamsByOrderHeaderAndOrder($orderHeader,$order)
-    {
-        /** @var LogisticService $logisticService */
-        $logisticService = app('LogisticService');
-        $client = $orderHeader['issuepartyname'] ?? '';
-        $order_remark = $orderHeader['notes'] ?? '';
-        $web_order_number = null;
-        if(preg_match('/^O[\d]/',$orderHeader['soreference1'] ?? '') > 0){
-            $web_order_number = $orderHeader['soreference1'];
-        }
-        $pick_up_at = $orderHeader->lastshipmenttime;
-        $planning_sent_at = null;
-
-        // 快递方式
-        $logistic = $logisticService->getLogisticByCode($orderHeader['userdefine1']);
-        if($orderHeader['userdefine1'] =='ZT') $logistic = $logisticService->getLogisticByCode('XJWL'); // 自提转新杰物流
-        if(isset($pick_up_at)){
-             $logisticTiming = app(LogisticTimingService::class)->findByParams($orderHeader['c_city']??'',$orderHeader['c_province']??'',$logistic['id']);
-             if($logisticTiming)$planning_sent_at = Carbon::parse((string)$pick_up_at)->addDays($logisticTiming->days_at_working); // 预期到货时间
-        }
-        if(stristr($order_remark,'[')){
-            $items = [];
-            preg_match_all('/^(.*?)(\\[)(.*?)(\\])(.*?)$/u',$order_remark,$items);
-            $client = $items[1][0];
-            $order_remark = $items[3][0];
-        }
-        if(mb_stristr($client,'天猫')!=false)$client='天猫';
-        if(mb_stristr($client,'京东')!=false)$client='京东';
-        return [
-            'owner_id' => $order->owner_id,
-            'logistic_id' => $logistic['id'],
-            'client' => $client,
-            'sale' => $orderHeader['issuepartyname'] ?? '',
-            'created_at' => $order->created_at,
-            'order_remark' => $order_remark,
-            'pick_up_at' => $orderHeader['lastshipmenttime'] ?? '', // 提货时间
-            'web_order_number' =>$web_order_number,
-            'is_on_duty_shift'=>$planning_sent_at?'是':null,
-            'planning_sent_at' => (string)$planning_sent_at
-        ];
-    }
-
     /**
      * @param Collection $orderHeaders
      */
@@ -511,19 +405,6 @@ class OrderTrackingService
         }
     }
 
-    /**
-     * @param OracleBasSKU $basSkU
-     * @param OrderPackageCommodities $orderPackageCommodity
-     * @return array
-     */
-    public function getGrossWeightAndBulk($basSkU,$orderPackageCommodity)
-    {
-        return [
-            'gross_weight' =>round($basSkU->grossweight * $orderPackageCommodity->amount, 2),
-            'bulk' =>round($basSkU->cube * $orderPackageCommodity->amount, 2),
-        ];
-    }
-
     public function fillInOrderTracking($orderTracking = null)
     {
         $orderTrackingIds = [];
@@ -561,4 +442,70 @@ class OrderTrackingService
         }
     }
 
+    public function getCreateParams($orderHeader,$order,$orderPackageCommodity,$BasSKUs_code_sku_map)
+    {
+        $params = [];
+        /**
+         * @var LogisticService $logisticService
+         * @var DataHandlerService $dataService
+         */
+        $logisticService = app('LogisticService');
+        $dataService = app('DataHandlerService');
+        $params['order_package_commodity_id'] = $orderPackageCommodity->id;
+        if(preg_match('/^O[\d]/',$orderHeader['soreference1'] ?? '') > 0){  // web_order_number  web+订单号
+            $params['web_order_number'] =$orderHeader['soreference1'];
+        }else $params['web_order_number']= null;
+
+        $params['owner_id'] = $order->owner_id ?? null; // owner_id
+
+        if($orderHeader['userdefine1'] =='ZT'){  // logistic_id
+            $logistic = $logisticService->getLogisticByCode('XJWL'); // 自提转新杰物流
+            $params['logistic_id'] = $logistic->id ?? null;
+        }else{
+            $logistic = $logisticService->getLogisticByCode($orderHeader['userdefine1']);
+            $params['logistic_id'] = $logistic->id ?? null;
+        }
+
+        $order_remark = $orderHeader['notes'] ?? '';        // 订单备注
+        if(mb_stristr($order_remark,'天猫') && mb_stristr($order_remark,'赠品')){ // client and order_remark 商铺 和 订单备注
+            $params['client'] = '天猫(赠品)';
+            $params['order_remark'] = $order_remark;
+        }else{
+            if(mb_stristr($order_remark,'[')){
+                $items = [];
+                preg_match_all('/^(.*?)(\\[)(.*?)(\\])(.*?)$/u',$order_remark,$items);
+                $params['client'] = $items[1][0];
+                $params['order_remark'] = $items[3][0];
+            }else{
+                $params['client'] = $orderHeader['issuepartyname'];
+                $params['order_remark'] = $order_remark;
+            }
+        }
+        if(mb_stristr($orderHeader['issuepartyname'],'天猫') && $params['client'] !== '天猫(赠品)') $params['client'] = '天猫';
+
+        if($params['client'] == '天猫') // order_client_code 订单号  店铺包含天猫
+            $params['order_client_code'] = $this->get_d_edit_03($orderHeader,$orderPackageCommodity);
+        else
+            $params['order_client_code'] = $order->client_code;
+
+        $params['sale'] = $orderHeader['issuepartyname'] ?? null;   // sale 销售
+
+        $params['pick_up_at'] = $orderHeader->lastshipmenttime ?? null;  // pick_up_at 提货时间
+
+        if($params['pick_up_at']){  //  planning_sent_at   预期到货时间
+            $logisticTiming = app(LogisticTimingService::class)->findByParams($orderHeader['c_city']??'',$orderHeader['c_province']??'',$logistic['id']);
+            if($logisticTiming) $params['planning_sent_at'] = (string)Carbon::parse((string)$params['pick_up_at'])->addDays($logisticTiming->days_at_working); // 预期到货时间
+            else  $params['planning_sent_at'] = null;
+        }else {
+            $params['planning_sent_at'] = null;
+        }
+
+        $params['is_on_duty_shift'] = isset($params['planning_sent_at']) ? '是' : null;  //is_on_duty_shift 是否卡班
+
+        $basSkU = $dataService->getKeyValue(['customerid'=>$orderHeader->customerid,'sku'=>$orderPackageCommodity->commodity->sku],$BasSKUs_code_sku_map);
+        $params['gross_weight'] = round($basSkU->grossweight * $orderPackageCommodity->amount, 2) ?? null;  // 重量
+        $params['bulk'] = round($basSkU->cube * $orderPackageCommodity->amount, 2) ?? null; // 体积
+        $params['created_at'] = Carbon::now();  // 创建时间
+        return $params;
+    }
 }