ACP2E-4142: Post-Patch ACP2E-4118: Stock Threshold Change in Admin Causes Negative Salable Quantities and Stock Status Mismatch

Author: aplapana

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -2530,22 +2530,22 @@ protected function _saveStockItem()
 
                 $row = [];
                 $sku = $rowData[self::COL_SKU];
+                $storeId = $this->getRowStoreId($rowData);
                 if ($this->skuProcessor->getNewSku($sku) !== null) {
                     $stockItem = $this->getRowExistingStockItem($rowData);
                     $existingStockItemData = $stockItem->getData();
                     $row = $this->formatStockDataForRow($rowData);
                     $productIdsToReindex[] = $row['product_id'];
-                    $storeId = $this->getRowStoreId($rowData);
                     if (!empty(array_diff_assoc($row, $existingStockItemData))
                         || $this->statusProcessor->isStatusChanged($sku, $storeId)
                     ) {
                         $stockChangedProductIds[] = $row['product_id'];
                     }
                 }
 
-                if (!isset($stockData[$sku])) {
-                    $stockData[$sku] = $row;
-                    $importedData[$sku] = $rowData;
+                if (!isset($stockData[$sku][$storeId])) {
+                    $stockData[$sku][$storeId] = $row;
+                    $importedData[$sku][$storeId] = $rowData;
                 }
             }
 
@@ -3399,7 +3399,7 @@ private function formatStockDataForRow(array $rowData): array
     {
         $sku = $rowData[self::COL_SKU];
         $row['product_id'] = $this->skuProcessor->getNewSku($sku)['entity_id'];
-        $row['website_id'] = $this->stockConfiguration->getDefaultScopeId();
+        $row['website_id'] = $this->stockConfiguration->getDefaultScopeId();//here be the problem
         $row['stock_id'] = $this->stockRegistry->getStock($row['website_id'])->getStockId();
 
         $stockItemDo = $this->stockRegistry->getStockItem($row['product_id'], $row['website_id']);

app/code/Magento/CatalogImportExport/Model/StockItemProcessor.php

@@ -7,6 +7,8 @@
 
 namespace Magento\CatalogImportExport\Model;
 
+use Magento\Store\Model\Store;
+
 class StockItemProcessor implements StockItemProcessorInterface
 {
     /**
@@ -28,6 +30,14 @@ public function __construct(
      */
     public function process(array $stockData, array $importedData): void
     {
-        $this->stockItemImporter->import($stockData);
+        $importStockData = [];
+        foreach ($stockData as $sku => $productStockData) {
+            if (isset($stockData[Store::DEFAULT_STORE_ID])) {
+                $importStockData[$sku] = $productStockData[Store::DEFAULT_STORE_ID];
+            } else {
+                $importStockData[$sku] = reset($productStockData);
+            }
+        }
+        $this->stockItemImporter->import($importStockData);
     }
 }