订单同步修改

app/Services/OrderPackageCommoditiesService.php

@@ -750,7 +750,7 @@ class OrderPackageCommoditiesService
         return $del_params;
     }
     // TODO  根据数据创建
-    public function createOrderCommodities($inner_params,$package_map)
+    public function createOrderCommodities(&$inner_params,&$package_map)
     {
         /** @var DataHandlerService $dataHandlerService */
         $dataHandlerService  = app('DataHandlerService');
@@ -787,7 +787,7 @@ class OrderPackageCommoditiesService
         }
         if(count($create_params)>0){
             try {
-                $inner_array = array_chunk($create_params,1000);
+                $inner_array = array_chunk($create_params,5000);
                 foreach ($inner_array as $item) {
                     $bool = $this->insert($item);
                     LogService::log(__METHOD__,__FUNCTION__,'批量添加 orderCommodity --'. $bool ." || ".count($item).' || '.json_encode($create_params));
@@ -798,7 +798,7 @@ class OrderPackageCommoditiesService
         }
     }
     // TODO
-    public function updateOrderCommodities($orderCommodities)
+    public function updateOrderCommodities(&$orderCommodities)
     {
         if(!$orderCommodities)return ;
         $updated_at = Carbon::now();
@@ -816,7 +816,7 @@ class OrderPackageCommoditiesService
             $this->batchUpdate($update_params);
     }
     // TODO 删除
-    public function deleteOrderCommodities($orderCommodities){
+    public function deleteOrderCommodities(&$orderCommodities){
         if(!$orderCommodities)return;
         if(count($orderCommodities)==0)return;
         try {

app/Services/OrderPackageService.php

@@ -417,6 +417,7 @@ class OrderPackageService
         $orderTracking = OrderTracking::query()->whereHas('commodities.package',function($query)use($del_ids){
             $query->whereIn('id',$del_ids);
         })->get();
+        if($orderTracking->count()==0)return;
         $orderTrackingService->deleteOrderTracings($orderTracking);                     // 删除追踪件
     }
     // TODO
@@ -439,7 +440,7 @@ class OrderPackageService
         }
         if(count($inner_params)>0){
             try {
-                $inner_array = array_chunk($inner_params,1000);
+                $inner_array = array_chunk($inner_params,5000);
                 foreach ($inner_array as $params) {
                     $bool = $this->insert($params);
                     $bool ? LogService::log(__METHOD__, __FUNCTION__, '批量添加 OrderPackage ' . count($inner_params) . ' || ' . json_encode($inner_params)) : null;

app/Services/OrderService.php

@@ -803,24 +803,25 @@ class OrderService
         $created_params = $this->getCreateOrderModelsByWMSOrderHeaders($orderHeaders,$orders,$warehouses,$owners,$logistics,$shops); //3s
 
         $update_order = $this->getUpdateOrderModelByWMSOrderHeaders($orderHeaders,$orders,$warehouses,$owners,$logistics,$shops);
+
+
         // 转换插入 3s
         if(count($created_params) > 0){
-            collect($created_params)->chunk(4000)->each(function($inner_params){
+            collect($created_params)->chunk(3500)->each(function($inner_params){
                 $this->insert($inner_params->toArray());
             });
         }
         $update_params = [
             ['id','code','warehouse_id','owner_id','shop_id','logistic_id','consignee_name','consignee_phone','province','city','district','address','client_code','wms_status','created_at','updated_at','wms_edittime']
         ];
-        $update_order->map(function ($item){
-            return $item->toArray();
-        })->each(function($item)use(&$update_params){
-            $update_params[] =$item;
+        $update_order->each(function($item)use(&$update_params){
+            $update_params[] = $item->toArray();
         });
+        if(count($update_order)==0)return;
         $this->batchUpdate($update_params);
     }
 
-    public function getCreateOrderModelsByWMSOrderHeaders($orderHeaders,$orders,$warehouses,$owners,$logistics,$shops)
+    public function getCreateOrderModelsByWMSOrderHeaders(&$orderHeaders,&$orders,&$warehouses,&$owners,&$logistics,&$shops)
     {
         /** @var DataHandlerService $dataHandlerService */
         $dataHandlerService = app('DataHandlerService');
@@ -845,7 +846,7 @@ class OrderService
         return $inner_params;
     }
 
-    public function getUpdateOrderModelByWMSOrderHeaders($orderHeaders,$orders,$warehouses,$owners,$logistics,$shops)
+    public function getUpdateOrderModelByWMSOrderHeaders(&$orderHeaders,&$orders,&$warehouses,&$owners,&$logistics,&$shops)
     {
         /**
          * @var DataHandlerService $dataHandlerService