Magento 2.X - "Неверный идентификатор адреса клиента" приходит случайным образом для клиентов при оформлении заказа

Ниже приведен мой код для предпочтений:

App/code/Vendor/Module/etc/di.xml :

<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<preference for="Magento\Quote\Model\QuoteAddressValidator" type="Vendor\Module\Model\QuoteAddressValidator" />
</config>

Ниже приведена модель для переопределения:

App/code/Vendor/Module/Model/QuoteAddressValidator.php

<?php

namespace Vendor\Module\Model;

use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Quote\Api\Data\AddressInterface;
use Magento\Quote\Api\Data\CartInterface;

/**
 * Quote shipping/billing address validator service.
 *
 * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
 */
class QuoteAddressValidator extends \Magento\Quote\Model\QuoteAddressValidator
{
/**
 * Address factory.
 *
 * @var \Magento\Customer\Api\AddressRepositoryInterface
 */
protected $addressRepository;

/**
 * Customer repository.
 *
 * @var \Magento\Customer\Api\CustomerRepositoryInterface
 */
protected $customerRepository;

/**
 * @deprecated 101.1.1 This class is not a part of HTML presentation layer and should not use sessions.
 */
protected $customerSession;

/**
 * Constructs a quote shipping address validator service object.
 *
 * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
 * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository Customer repository.
 * @param \Magento\Customer\Model\Session $customerSession
 */
public function __construct(
    \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
    \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
    \Magento\Customer\Model\Session $customerSession
) {
    $this->addressRepository = $addressRepository;
    $this->customerRepository = $customerRepository;
    $this->customerSession = $customerSession;
}

/**
 * Validate address.
 *
 * @param AddressInterface $address
 * @param int|null $customerId Cart belongs to
 * @return void
 * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
 * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
 */
private function doValidate(AddressInterface $address, ?int $customerId): void
{
    //validate customer id
    if ($customerId) {
        $customer = $this->customerRepository->getById($customerId);
        if (!$customer->getId()) {
            throw new \Magento\Framework\Exception\NoSuchEntityException(
                __('Invalid customer id %1', $customerId)
            );
        }
    }

    if ($address->getCustomerAddressId()) {
        //Existing address cannot belong to a guest
        if (!$customerId) {
            throw new \Magento\Framework\Exception\NoSuchEntityException(
                __('Invalid customer address id %1', $address->getCustomerAddressId())
            );
        }
        //Validating address ID
        try {
            $this->addressRepository->getById($address->getCustomerAddressId());
        } catch (NoSuchEntityException $e) {
            throw new \Magento\Framework\Exception\NoSuchEntityException(
                __('Invalid address id %1', $address->getId())
            );
        }
        //Finding available customer's addresses
        $applicableAddressIds = array_map(function ($address) {
            /** @var \Magento\Customer\Api\Data\AddressInterface $address */
            return $address->getId();
        }, $this->customerRepository->getById($customerId)->getAddresses());
        if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
            throw new \Magento\Framework\Exception\NoSuchEntityException(
                __('Invalid customer address id %1', $address->getCustomerAddressId())
            );
        }
    }
}

/**
 * Validates the fields in a specified address data object.
 *
 * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
 * @return bool
 * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
 * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
 */
public function validate(AddressInterface $addressData)
{
    $this->doValidate($addressData, $addressData->getCustomerId());

    return true;
}

/**
 * Validate address to be used for cart.
 *
 * @param CartInterface $cart
 * @param AddressInterface $address
 * @return void
 * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
 * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
 */
/*public function validateForCart(CartInterface $cart, AddressInterface $address): void
{
    $this->doValidate($address, $cart->getCustomerIsGuest() ? null : $cart->getCustomer()->getId());
}*/

public function validateForCart(CartInterface $cart, AddressInterface $address): void
{
    $this->doValidate($address, $cart->getCustomerId() ? $cart->getCustomer()->getId() : null );
}
}