MC-42243: Sorting by price is incorrect if price for shared catalog is 0

Author: dhorytskyi

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php

@@ -394,8 +394,16 @@ private function getSelectForUpdate(string $sourceTable): Select
         );
         $select->columns(
             [
-                'min_price' => new ColumnValueExpression('i.min_price + io.min_price'),
-                'max_price' => new ColumnValueExpression('i.max_price + io.max_price'),
+                'min_price' => $connection->getCheckSql(
+                    'i.min_price IS NOT NULL',
+                    'i.min_price + io.min_price',
+                    'NULL'
+                ),
+                'max_price' => $connection->getCheckSql(
+                    'i.max_price IS NOT NULL',
+                    'i.max_price + io.max_price',
+                    'NULL'
+                ),
                 'tier_price' => $connection->getCheckSql(
                     'i.tier_price IS NOT NULL',
                     'i.tier_price + io.tier_price',

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php

@@ -149,8 +149,8 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds)
         );
         $this->tableMaintainer->insertFromSelect($select, $temporaryPriceTable->getTableName(), []);
 
-        $this->basePriceModifier->modifyPrice($temporaryPriceTable, iterator_to_array($entityIds));
         $this->applyConfigurableOption($temporaryPriceTable, $dimensions, iterator_to_array($entityIds));
+        $this->basePriceModifier->modifyPrice($temporaryPriceTable, iterator_to_array($entityIds));
     }
 
     /**