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

app/Services/BatchService.php

@@ -115,7 +115,7 @@ class BatchService
     public function checkBatchOrderInfo($batches)
     {
         if (!is_array($batches))$batches = $batches->toArray();
-        $ids = array_column($batches->toArray(),"id");
+        $ids = array_column($batches,"id");
         $batches = Batch::query()->whereIn("id",$ids)->with("orders.orderCommodities")->get();
         foreach ($batches as $batch){
             if (!$batch->orders)continue;