Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Console/Commands/SyncBatchTask.php

@@ -172,8 +172,13 @@ sql;
             }
             $updateBin = [["id","number"]];
             $insertBin = [];
+            $deleteBin = [];
             $orderBins = OrderBin::query()->select("id","order_id","number")->whereIn("order_id",$orderIds)->get();
             foreach ($orderBins as $orderBin){
+                if (!isset($orderMap[$orderBin->order_id])){
+                    $deleteBin[] = $orderBin->id;
+                    continue;
+                }
                 if ($orderBin->number != $orderMap[$orderBin->order_id])$updateBin[]=["id"=>$orderBin->id,"number"=>$orderMap[$orderBin->order_id]];
                 unset($orderMap[$orderBin->order_id]);
             }
@@ -191,6 +196,10 @@ sql;
                 OrderBin::query()->insert($insertBin);
                 LogService::log(__METHOD__,"波次同步-录入订单格口号",json_encode($insertBin));
             }
+            if ($deleteBin){
+                OrderBin::destroy($deleteBin);
+                LogService::log(__METHOD__,"波次同步-删除订单格口号",json_encode($deleteBin));
+            }
         }
         $batches = $this->batchService->get(["code"=>$nos]);
         foreach ($batches as $batch){