Исправление 2

diff --git a/erp24/media/controllers/FlowwowController.php b/erp24/media/controllers/FlowwowController.php
index 8027964715e7b70333244a1678676f3a559b0079..d7fd1eab99ede3d47c77d852bb5171e181e08717 100644 (file)
--- a/erp24/media/controllers/FlowwowController.php
+++ b/erp24/media/controllers/FlowwowController.php
@@ -28,7 +28,7 @@ class FlowwowController extends Controller
 
     public function actionTest(){
 
-        $products =  MarketplaceService::infoForMarketplace(1, false);
+        $products =  MarketplaceService::infoForMarketplace(1);
 
         var_dump($products);
 

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index cf075d6ca9dcdfaca8f8518ea01ce959301faf1e..639051cb176e04f1a8512305372ca194ddd0559b 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -64,9 +64,8 @@ class MarketplaceService
     ];
 
     public static function infoForMarketplace(int $marketId) {
-        if (!array_key_exists($marketId, MarketplaceStore::getWarehouseId())) {
-            return null;
-        }
+        if (!array_key_exists($marketId, MarketplaceStore::getWarehouseId()))
+            return;
 
         $is_yandex = $marketId == 2;
 
@@ -85,16 +84,7 @@ class MarketplaceService
             ->all();
 
         // 2. Получение цен на букеты
-      //  $prices = ArrayHelper::map(Prices::findAll(['product_id' => ArrayHelper::getColumn($productsGuids, 'id')]), 'product_id', 'price');
-        $allPrices = Prices::findAll(['product_id' => $productsGuids]);
-        $prices = ArrayHelper::map($allPrices, 'product_id', 'price');
-
-
-        foreach ($productsGuids as $productId) {
-            if (!array_key_exists($productId, $prices)) {
-                $prices[$productId] = 0;
-            }
-        }
+        $prices = ArrayHelper::map(Prices::findAll(['product_id' => ArrayHelper::getColumn($productsGuids, 'id')]), 'product_id', 'price');
 
         // 3. Получение состава букетов
         $bouquetComposition = [];
@@ -152,13 +142,11 @@ class MarketplaceService
                 $temp = intval($values['count'] / $products->$productGuid);
                 $bouquetCount = !empty($bouquetCount) ? min($bouquetCount, $temp) : $temp;
                 $store = $values['marketplace_guid'];
-
+            }
 
             if (!empty($stockRecords) && isset($store) && $bouquetCount > 0) {
                 $stocks[$guid] = ['count' => $bouquetCount, 'store' => $store];
             }
-            }
-
         }
 
         // 5. Получение приоритетов
@@ -243,6 +231,7 @@ class MarketplaceService
         return Json::encode($distribution);
     }
 
+
     /**
      * Статический метод для получения всей информации по продуктам, которая необходима для создания фида.
      *