ACP2E-1117: CustomerAddressId not set for new billing address

Author: pradeep1819

app/code/Magento/Checkout/Model/AddressMapper.php

@@ -9,6 +9,7 @@
 
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\PaymentInterface;
@@ -32,21 +33,29 @@ class AddressMapper implements AddressMapperInterface
      */
     private $quoteIdMaskFactory;
 
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
     /**
      * AddressMapper constructor
      *
      * @param CartRepositoryInterface $cartRepository
      * @param AddressRepositoryInterface $addressRepository
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param SerializerInterface $serializer
      */
     public function __construct(
         CartRepositoryInterface $cartRepository,
         AddressRepositoryInterface $addressRepository,
-        QuoteIdMaskFactory $quoteIdMaskFactory
+        QuoteIdMaskFactory $quoteIdMaskFactory,
+        SerializerInterface $serializer
     ) {
         $this->cartRepository = $cartRepository;
         $this->addressRepository = $addressRepository;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->serializer = $serializer;
     }
 
     /**
@@ -183,8 +192,20 @@ private function checkIfShippingAddressMatchesWithBillingAddress(
                 $shippingData = array_intersect_key($quoteShippingAddressData, $billingKeys);
                 $removeKeys = ['region_code', 'save_in_address_book'];
                 $billingData = array_diff_key($billingData, array_flip($removeKeys));
-                $difference = array_diff($billingData, $shippingData);
-                $sameAsBillingFlag = empty($difference);
+                $diff = array_udiff(
+                    $billingData,
+                    $shippingData,
+                    function ($el1, $el2) {
+                        if (is_object($el1)) {
+                            $el1 = $this->serializer->serialize($el1);
+                        }
+                        if (is_object($el2)) {
+                            $el2 = $this->serializer->serialize($el2);
+                        }
+                        return strcmp((string)$el1, (string)$el2);
+                    }
+                );
+                $sameAsBillingFlag = empty($diff);
             } else {
                 $sameAsBillingFlag = false;
             }