Merge branch 'develop'

Repository/Order/OrderShopStore.php

@@ -300,7 +300,7 @@ class OrderShopStore extends AbstractStore
                                $query = null
     ): int
     {
-        $query = $this->createDefaultQuery($query);
+        $query = $this->createQuery($query);
 
         $query
             ->selectCount()