From c662da76a0b0eaa8ea6499f08f62ce38e11f7271 Mon Sep 17 00:00:00 2001
From: wufan <wufan@gmail.com>
Date: Fri, 17 Jan 2025 16:51:12 +0800
Subject: [PATCH] :sparkles:

---
 TradeManageNew/DD_OrderServiceNew.asmx.cs     | 54 +++++++++++--------
 .../Models/DT_ShopifyUsedSaleOrder.cs         |  5 ++
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs
index 1d82f76..c6e6206 100644
--- a/TradeManageNew/DD_OrderServiceNew.asmx.cs
+++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs
@@ -28794,7 +28794,7 @@ namespace TradeManageNew
                                     Country = shopifyOrder?.Country,
                                     CountryCode = shopifyOrder?.CountryCode,
                                     Currency = shopifyOrder?.Currency,
-                                    TotalPrice = shopifyOrder?.TotalPrice,
+                                    TotalPrice = shopifyOrderItem.Price,
                                 };
                                 
                                 resultItem.ShopifyOrder = shopifyOrderDto;
@@ -29623,35 +29623,47 @@ namespace TradeManageNew
                     };
                 }
 
-                var getAddressTypeParameter = new FedexValidateAddressModel
+                var isResidential = true;
+                if (shopifyUsedSaleOrder.IsResidential is null)
                 {
-                    addressesToValidate = new List<addressesToValidate>()
+                    var getAddressTypeParameter = new FedexValidateAddressModel
                     {
-                        new addressesToValidate
+                        addressesToValidate = new List<addressesToValidate>()
                         {
-                            address = new validateAddress()
+                            new addressesToValidate
                             {
-                                streetLines = new[] { shopifyUsedSaleOrder.Full },
-                                city = shopifyUsedSaleOrder.City,
-                                stateOrProvinceCode = shopifyUsedSaleOrder.ProvinceCode,
-                                countryCode = shopifyUsedSaleOrder.CountryCode,
-                                postalCode = shopifyUsedSaleOrder.Zip,
+                                address = new validateAddress()
+                                {
+                                    streetLines = new[] { shopifyUsedSaleOrder.Full },
+                                    city = shopifyUsedSaleOrder.City,
+                                    stateOrProvinceCode = shopifyUsedSaleOrder.ProvinceCode,
+                                    countryCode = shopifyUsedSaleOrder.CountryCode,
+                                    postalCode = shopifyUsedSaleOrder.Zip,
+                                }
                             }
                         }
+                    };
+                    var addressType = GetValidateAddressJump(getAddressTypeParameter, out var getAddressTypeError);
+                    if (addressType == null || !string.IsNullOrEmpty(getAddressTypeError))
+                    {
+                        return new APIReturnModel
+                        {
+                            Code = 0,
+                            Message = $"[{orderUsedSalePlatform.BarCode}]获取地址类型失败，请稍后再试",
+                            Datas = null
+                        };
                     }
-                };
-                var addressType = GetValidateAddressJump(getAddressTypeParameter, out var getAddressTypeError);
-                if (addressType == null || !string.IsNullOrEmpty(getAddressTypeError))
+                    //是否住宅地址
+                    isResidential = !(addressType.ToUpper() == "BUSINESS" || addressType.ToUpper() == "OFFICE");
+
+                    db.DT_ShopifyUsedSaleOrder.Where(x => x.Id == shopifyUsedSaleOrderItem.DtShopifyUsedSaleOrderId)
+                        .Set(x => x.IsResidential, isResidential)
+                        .Update();
+                }
+                else
                 {
-                    return new APIReturnModel
-                    {
-                        Code = 0,
-                        Message = $"[{orderUsedSalePlatform.BarCode}]获取地址类型失败，请稍后再试",
-                        Datas = null
-                    };
+                    isResidential = shopifyUsedSaleOrder.IsResidential.Value;
                 }
-                //是否住宅地址
-                bool isResidential = !(addressType.ToUpper() == "BUSINESS" || addressType.ToUpper() == "OFFICE");
                 
                 //获取Fedex运费和面单
                 var fedexCredential = new FedexCredential(isDebugMode: true) { ReadResponseAsString = true };
diff --git a/TradeUsedSale/Repositories/Models/DT_ShopifyUsedSaleOrder.cs b/TradeUsedSale/Repositories/Models/DT_ShopifyUsedSaleOrder.cs
index 7e9d09b..54b9304 100644
--- a/TradeUsedSale/Repositories/Models/DT_ShopifyUsedSaleOrder.cs
+++ b/TradeUsedSale/Repositories/Models/DT_ShopifyUsedSaleOrder.cs
@@ -124,5 +124,10 @@ namespace TradeUsedSale.Repositories.Models
         /// 取消时间
         /// </summary>
         public DateTime? CancelDate { get; set; }
+
+        /// <summary>
+        /// 是否住宅地址
+        /// </summary>
+        public bool? IsResidential { get; set; }
     }
 }
\ No newline at end of file