订单同步修改

app/Console/Commands/SyncWMSOrderTask.php

@@ -39,6 +39,7 @@ class SyncWMSOrderTask extends Command
     public function handle()
     {
         $is_enabled= config('sync.order_sync.cache_prefix.enabled');
+        sleep(rand(5,10));
         if($is_enabled=='false')return;
         $this->syncCreatedOrder();
         $this->syncUpdatedOrder();

app/Http/Controllers/TestController.php

@@ -24,6 +24,7 @@ use App\OrderBin;
 use App\OrderCommodity;
 use App\OrderIssue;
 use App\OrderPackage;
+use App\OrderPackageCommodities;
 use App\Owner;
 use App\Package;
 use App\Process;
@@ -1148,8 +1149,6 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
             },'oracleBASCode'=>function($query){
                 $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
             }])
-//            ->where('DOC_Order_Header.addTime','>=',$startDate)
-//            ->where('orderno','SO201112029795')
             ->where('DOC_Order_Header.addTime','>=',$carbon)
             ->get();
         /** @var OrderService $service */
@@ -1225,4 +1224,12 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         $orderTrackingService->createByWmsOrderHeader($orderHeaders);
     }
 
+    public function testSyncOrderTask(){
+        dump('hendle...');
+        dump((string)Carbon::now());
+        $task = new SyncWMSOrderTask();
+        $task->handle();
+        dump((string)Carbon::now());
+        dd('hendle...end');
+    }
 }

app/Services/OrderCommodityService.php

@@ -109,7 +109,7 @@ Class OrderCommodityService
                 'sku' => $orderCommodity['commodity']['sku'],
                 'owner_id' => $orderCommodity['order']['owner_id'],
                 'amount' => $orderCommodity['amount'],
-                'location' => $orderCommodity['location']
+                'location' => $orderCommodity['location'] ?? ''
             ];
         }
         return $map;

app/Services/OrderPackageCommoditiesService.php

@@ -594,10 +594,9 @@ class OrderPackageCommoditiesService
     {
         if(!$ids)return;
         if(count($ids)==0)return;
-        OrderPackageCommodities::query()->whereHas('package',function($query)use($ids){
-            $query->whereIn('id',$ids);
-        })->delete();
-        app('LogService')->log(__METHOD__,__FUNCTION__,'删除 OrderPackageCommodities'.json_encode($ids));
+        $items = OrderPackageCommodities::query()->whereIn('order_package_id',$ids)->get();
+        OrderPackageCommodities::query()->whereIn('order_package_id',$ids)->delete();
+        app('LogService')->log(__METHOD__,__FUNCTION__,'删除 OrderPackageCommodities'.json_encode($items));
     }
     // TODO
     public function syncOrderPackageCommodities(&$orderHeaders)

app/Services/OrderPackageService.php

@@ -420,8 +420,8 @@ class OrderPackageService
 
         $orderPackageCommodityService->deleteUnnecessaryOrderCommodities($del_ids);     // 删除 orderCommodity
 
-        $orderTracking = OrderTracking::query()->whereHas('commodities.package',function($query)use($del_ids){
-            $query->whereIn('id',$del_ids);
+        $orderTracking = OrderTracking::query()->whereHas('commodities',function($query)use($del_ids){
+            $query->whereIn('order_package_id',$del_ids);
         })->get();
         if($orderTracking->count()==0)return;