Merge branch 'dev' of http://gogs.hnwmzp.cn/chengwenliang/nshop into dev

packages/Webkul/BagistoApi/src/Dto/CheckoutAddressOutput.php

@@ -65,6 +65,10 @@ class CheckoutAddressOutput
     #[ApiProperty(readable: true, writable: false)]
     public ?string $billingPhoneNumber = null;
 
+    #[Groups(['query', 'mutation'])]
+    #[ApiProperty(readable: true, writable: false)]
+    public ?int $billingAddressId = null;
+
     // Shipping Address
     #[Groups(['query', 'mutation'])]
     #[ApiProperty(readable: true, writable: false)]
@@ -106,6 +110,10 @@ class CheckoutAddressOutput
     #[ApiProperty(readable: true, writable: false)]
     public ?string $shippingPhoneNumber = null;
 
+    #[Groups(['query', 'mutation'])]
+    #[ApiProperty(readable: true, writable: false)]
+    public ?int $shippingAddressId = null;
+
     #[Groups(['query', 'mutation'])]
     #[ApiProperty(readable: true, writable: false)]
     public ?bool $success = null;

packages/Webkul/BagistoApi/src/State/CheckoutAddressProvider.php

@@ -67,6 +67,7 @@ class CheckoutAddressProvider implements ProviderInterface
             $output->billingCity = $billingAddress->city;
             $output->billingPostcode = $billingAddress->postcode;
             $output->billingPhoneNumber = $billingAddress->phone;
+            $output->billingAddressId = $billingAddress->id;
         }
 
         $shippingAddress = $cart->shipping_address;
@@ -81,6 +82,7 @@ class CheckoutAddressProvider implements ProviderInterface
             $output->shippingCity = $shippingAddress->city;
             $output->shippingPostcode = $shippingAddress->postcode;
             $output->shippingPhoneNumber = $shippingAddress->phone;
+            $output->shippingAddressId = $shippingAddress->id;
         }
 
         $output->success = true;

packages/Webkul/BagistoApi/src/State/CheckoutProcessor.php

@@ -522,6 +522,7 @@ class CheckoutProcessor implements ProcessorInterface
             $output->billingCity = (string) ($billingAddress->city ?? '');
             $output->billingPostcode = (string) ($billingAddress->postcode ?? '');
             $output->billingPhoneNumber = (string) ($billingAddress->phone ?? '');
+            $output->billingAddressId = $billingAddress->id;
         }
 
         if ($shippingAddress) {
@@ -535,6 +536,7 @@ class CheckoutProcessor implements ProcessorInterface
             $output->shippingCity = (string) ($shippingAddress->city ?? '');
             $output->shippingPostcode = (string) ($shippingAddress->postcode ?? '');
             $output->shippingPhoneNumber = (string) ($shippingAddress->phone ?? '');
+            $output->shippingAddressId = $shippingAddress->id;
         }
 
         return $output;
@@ -564,6 +566,7 @@ class CheckoutProcessor implements ProcessorInterface
                 $output->billingCity = $billingAddress->city;
                 $output->billingPostcode = $billingAddress->postcode;
                 $output->billingPhoneNumber = $billingAddress->phone;
+                $output->billingId = $billingAddress->id;
             }
 
             $shippingAddress = $cart->shipping_address;
@@ -578,6 +581,7 @@ class CheckoutProcessor implements ProcessorInterface
                 $output->shippingCity = $shippingAddress->city;
                 $output->shippingPostcode = $shippingAddress->postcode;
                 $output->shippingPhoneNumber = $shippingAddress->phone;
+                $output->shippingId = $shippingAddress->id;
             }
 
             $output->success = true;