修改CommodityService的商品策略

app/Services/CommodityService.php

@@ -258,7 +258,6 @@ Class CommodityService
         return Commodity::query()->create($params);
     }
 
-
     public function syncBarcodes($barcodesStr, $ownerId, $sku): Commodity
     {
         $barcodes = (function () use ($barcodesStr) {
@@ -379,30 +378,6 @@ Class CommodityService
         return false;
     }
 
-    public function getCommoditiesByMap($map)
-    {
-        $collect = collect();
-        if (count($map) == 0) return $collect;
-        foreach ($map as $item) {
-            $commodity = $this->getCommodityByOwnerCodeAndSKU($item['owner_code'], $item['sku']);
-            $collect->push($commodity);
-        }
-        return $collect;
-    }
-
-    public function getCommodityByOwnerCodeAndSKU($ownerCode, $sku)
-    {
-        $commodity_key = "owner_code_{$ownerCode}_sku_{$sku}";
-        return Cache::remember($commodity_key, config('cache.expirations.forever'), function () use ($ownerCode, $sku) {
-            $commodity = Commodity::query()->where('sku', $sku)->where('owner_id', function ($query) use ($ownerCode) {
-                $query->from('owners')->select('id')->where('code', $ownerCode);
-            })->first();
-            if (isset($commodity)) return $commodity;
-            $basSKu = app('OracleBasSkuService')->first(['sku' => $sku, 'customerid' => $ownerCode]);
-            return Commodity::query()->create($this->getParamsByBasSku($basSKu));
-        });
-    }
-
     public function getParamsByBasSku($basSku, $owner = null)
     {
         if (empty($owner)) {

app/Services/OrderCommodityService.php

@@ -59,7 +59,7 @@ Class OrderCommodityService
         $owners = $ownerService->getOwnerByCodes($owner_codes);
         $owner_id_maps = $dataHandlerService->dataHeader(['id'],$owners);
 //        $commodities = $commodityService->get_(data_get($owners,'*.id'),$sku_codes,[],true);
-        $commodities = $commodityService->getCommoditiesByMap($map);
+        $commodities = $commodityService->getCommoditiesByMaps($map);
         unset($owner_codes,$sku_codes);
         $commodity_map = [];
         foreach ($commodities as $commodity) {

app/Services/OrderPackageCommoditiesService.php

@@ -641,7 +641,7 @@ class OrderPackageCommoditiesService
         if(count($owner_codes) ==0 || count($sku_codes) == 0)return ;
         $owners = $ownerService->getOwnerByCodes($owner_codes);
 //        $commodities = $commodityService->get_(data_get($owners,'*.id'),$sku_codes,[],true);   // 预先处理     3s
-        $commodities = $commodityService->getCommoditiesByMap($map);   // 预先处理     3s
+        $commodities = $commodityService->getCommoditiesByMaps($map);   // 预先处理     3s
         $orderPackages = $orderPackageService->getByWmsOrders($orderHeaders);
         $orderCommodities = $this->getByWmsOrder($orderHeaders);
         $owner_id_map=[];