Merge branch 'master' of http://192.168.1.150:8083/wufan/ERP

TradeManageNew/DD_OrderServiceNew.asmx.cs

@@ -28717,7 +28717,7 @@ namespace TradeManageNew
                     var products = db.HW_GoodsInfo.Where(x => productIds.Contains(x.GoodsId)).Select(o => new
                     {
                         ProductId = o.GoodsId,
-                        FirstImgUrl = o.FirstImgUrl
+                        o.FirstImgUrl
                     }).ToList();
 
                     foreach (var pageItem in page)
@@ -28769,25 +28769,29 @@ namespace TradeManageNew
                                 var shopifyOrder = shopifyOrders.FirstOrDefault(x =>
                                     x.Id == shopifyOrderItem.DtShopifyUsedSaleOrderId);
                                 
-                                resultItem.OrderId = shopifyOrder?.OrderId;
+                                var shopifyOrderDto =new ShopifyUsedSaleOrderInfoDto
-                                resultItem.OrderNumber = shopifyOrder?.OrderNumber;
+                                {
-                                resultItem.OrderName = shopifyOrder?.OrderName;
+                                    OrderId = shopifyOrder?.OrderId,
-                                resultItem.CreatedAt = shopifyOrder?.CreatedAt;
+                                    OrderNumber = shopifyOrder?.OrderNumber,
-                                resultItem.UpdatedAt = shopifyOrder?.UpdatedAt;
+                                    OrderName = shopifyOrder?.OrderName,
-                                resultItem.ProcessedAt = shopifyOrder?.ProcessedAt;
+                                    CreatedAt = shopifyOrder?.CreatedAt,
-                                resultItem.Name = shopifyOrder?.Name;
+                                    UpdatedAt = shopifyOrder?.UpdatedAt,
-                                resultItem.Phone = shopifyOrder?.Phone;
+                                    ProcessedAt = shopifyOrder?.ProcessedAt,
-                                resultItem.Full = shopifyOrder?.Full;
+                                    Name = shopifyOrder?.Name,
-                                resultItem.Detail = shopifyOrder?.Detail;
+                                    Phone = shopifyOrder?.Phone,
-                                resultItem.Detail2 = shopifyOrder?.Detail2;
+                                    Full = shopifyOrder?.Full,
-                                resultItem.City = shopifyOrder?.City;
+                                    Detail = shopifyOrder?.Detail,
-                                resultItem.Province = shopifyOrder?.Province;
+                                    Detail2 = shopifyOrder?.Detail2,
-                                resultItem.ProvinceCode = shopifyOrder?.ProvinceCode;
+                                    City = shopifyOrder?.City,
-                                resultItem.Zip = shopifyOrder?.Zip;
+                                    Province = shopifyOrder?.Province,
-                                resultItem.Country = shopifyOrder?.Country;
+                                    ProvinceCode = shopifyOrder?.ProvinceCode,
-                                resultItem.CountryCode = shopifyOrder?.CountryCode;
+                                    Zip = shopifyOrder?.Zip,
-                                resultItem.Currency = shopifyOrder?.Currency;
+                                    Country = shopifyOrder?.Country,
-                                resultItem.TotalPrice = shopifyOrder?.TotalPrice;
+                                    CountryCode = shopifyOrder?.CountryCode,
+                                    Currency = shopifyOrder?.Currency,
+                                    TotalPrice = shopifyOrder?.TotalPrice,
+                                };
+                                resultItem.ShopifyOrder = shopifyOrderDto;
                             }
                         }
                     }

TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs

@@ -93,75 +93,6 @@ namespace TradeManageNew.Models.ShopifyUsedSale
         /// </summary>
         public string PublishMessage { get; set; }
 
-        public string OrderId { get; set; }
+        public ShopifyUsedSaleOrderInfoDto ShopifyOrder { get; set; }
-
-        public string OrderNumber { get; set; }
-
-        public string OrderName { get; set; }
-
-        public DateTime? CreatedAt { get; set; }
-
-        public DateTime? UpdatedAt { get; set; }
-
-        public DateTime? ProcessedAt { get; set; }
-
-        /// <summary>
-        /// 收件人
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 收件人电话
-        /// </summary>
-        public string Phone { get; set; }
-
-        /// <summary>
-        /// 完整地址
-        /// </summary>
-        public string Full { get; set; }
-
-        /// <summary>
-        /// 地址1
-        /// </summary>
-        public string Detail { get; set; }
-
-        /// <summary>
-        /// 地址2
-        /// </summary>
-        public string Detail2 { get; set; }
-
-        /// <summary>
-        /// 城市
-        /// </summary>
-        public string City { get; set; }
-
-        /// <summary>
-        /// 省
-        /// </summary>
-        public string Province { get; set; }
-
-        /// <summary>
-        /// 省编码
-        /// </summary>
-        public string ProvinceCode { get; set; }
-
-        /// <summary>
-        /// 邮编
-        /// </summary>
-        public string Zip { get; set; }
-
-        /// <summary>
-        /// 国家
-        /// </summary>
-        public string Country { get; set; }
-
-        /// <summary>
-        /// 国家编码
-        /// </summary>
-        public string CountryCode { get; set; }
-
-        public string Currency { get; set; }
-
-        public decimal? TotalPrice { get; set; }
     }
 }

TradeManageNew/Models/ShopifyUsedSale/ShopifyUsedSaleOrderInfoDto.cs

@@ -0,0 +1,78 @@
+using System;
+
+namespace TradeManageNew.Models.ShopifyUsedSale
+{
+    public class ShopifyUsedSaleOrderInfoDto
+    {
+        public string OrderId { get; set; }
+
+        public string OrderNumber { get; set; }
+
+        public string OrderName { get; set; }
+
+        public DateTime? CreatedAt { get; set; }
+
+        public DateTime? UpdatedAt { get; set; }
+
+        public DateTime? ProcessedAt { get; set; }
+
+        /// <summary>
+        /// 收件人
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 收件人电话
+        /// </summary>
+        public string Phone { get; set; }
+
+        /// <summary>
+        /// 完整地址
+        /// </summary>
+        public string Full { get; set; }
+
+        /// <summary>
+        /// 地址1
+        /// </summary>
+        public string Detail { get; set; }
+
+        /// <summary>
+        /// 地址2
+        /// </summary>
+        public string Detail2 { get; set; }
+
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string City { get; set; }
+
+        /// <summary>
+        /// 省
+        /// </summary>
+        public string Province { get; set; }
+
+        /// <summary>
+        /// 省编码
+        /// </summary>
+        public string ProvinceCode { get; set; }
+
+        /// <summary>
+        /// 邮编
+        /// </summary>
+        public string Zip { get; set; }
+
+        /// <summary>
+        /// 国家
+        /// </summary>
+        public string Country { get; set; }
+
+        /// <summary>
+        /// 国家编码
+        /// </summary>
+        public string CountryCode { get; set; }
+
+        public string Currency { get; set; }
+
+        public decimal? TotalPrice { get; set; }
+    }
+}

TradeManageNew/TradeManageNew.csproj

@@ -2934,6 +2934,7 @@
     <Compile Include="Models\ShopifyUsedSale\CancelShopifyUsedSaleOrderDto.cs" />
     <Compile Include="Models\ShopifyUsedSale\OrderUsedSalePlatformPageDto.cs" />
     <Compile Include="Models\ShopifyUsedSale\ShopifyUsedSaleOrderDto.cs" />
+    <Compile Include="Models\ShopifyUsedSale\ShopifyUsedSaleOrderInfoDto.cs" />
     <Compile Include="OrderAPI.ashx.cs">
       <DependentUpon>OrderAPI.ashx</DependentUpon>
     </Compile>