diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs index fc9c6fb..8f79fb6 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/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) @@ -28768,26 +28768,30 @@ namespace TradeManageNew { var shopifyOrder = shopifyOrders.FirstOrDefault(x => x.Id == shopifyOrderItem.DtShopifyUsedSaleOrderId); - - resultItem.OrderId = shopifyOrder?.OrderId; - resultItem.OrderNumber = shopifyOrder?.OrderNumber; - resultItem.OrderName = shopifyOrder?.OrderName; - resultItem.CreatedAt = shopifyOrder?.CreatedAt; - resultItem.UpdatedAt = shopifyOrder?.UpdatedAt; - resultItem.ProcessedAt = shopifyOrder?.ProcessedAt; - resultItem.Name = shopifyOrder?.Name; - resultItem.Phone = shopifyOrder?.Phone; - resultItem.Full = shopifyOrder?.Full; - resultItem.Detail = shopifyOrder?.Detail; - resultItem.Detail2 = shopifyOrder?.Detail2; - resultItem.City = shopifyOrder?.City; - resultItem.Province = shopifyOrder?.Province; - resultItem.ProvinceCode = shopifyOrder?.ProvinceCode; - resultItem.Zip = shopifyOrder?.Zip; - resultItem.Country = shopifyOrder?.Country; - resultItem.CountryCode = shopifyOrder?.CountryCode; - resultItem.Currency = shopifyOrder?.Currency; - resultItem.TotalPrice = shopifyOrder?.TotalPrice; + + var shopifyOrderDto =new ShopifyUsedSaleOrderInfoDto + { + OrderId = shopifyOrder?.OrderId, + OrderNumber = shopifyOrder?.OrderNumber, + OrderName = shopifyOrder?.OrderName, + CreatedAt = shopifyOrder?.CreatedAt, + UpdatedAt = shopifyOrder?.UpdatedAt, + ProcessedAt = shopifyOrder?.ProcessedAt, + Name = shopifyOrder?.Name, + Phone = shopifyOrder?.Phone, + Full = shopifyOrder?.Full, + Detail = shopifyOrder?.Detail, + Detail2 = shopifyOrder?.Detail2, + City = shopifyOrder?.City, + Province = shopifyOrder?.Province, + ProvinceCode = shopifyOrder?.ProvinceCode, + Zip = shopifyOrder?.Zip, + Country = shopifyOrder?.Country, + CountryCode = shopifyOrder?.CountryCode, + Currency = shopifyOrder?.Currency, + TotalPrice = shopifyOrder?.TotalPrice, + }; + resultItem.ShopifyOrder = shopifyOrderDto; } } } diff --git a/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs b/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs index 4b4d845..435bdf0 100644 --- a/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs +++ b/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs @@ -92,76 +92,7 @@ namespace TradeManageNew.Models.ShopifyUsedSale /// 推送至平台信息 /// public string PublishMessage { get; set; } - - 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; } - - /// - /// 收件人 - /// - public string Name { get; set; } - - /// - /// 收件人电话 - /// - public string Phone { get; set; } - - /// - /// 完整地址 - /// - public string Full { get; set; } - - /// - /// 地址1 - /// - public string Detail { get; set; } - - /// - /// 地址2 - /// - public string Detail2 { get; set; } - - /// - /// 城市 - /// - public string City { get; set; } - - /// - /// 省 - /// - public string Province { get; set; } - - /// - /// 省编码 - /// - public string ProvinceCode { get; set; } - - /// - /// 邮编 - /// - public string Zip { get; set; } - - /// - /// 国家 - /// - public string Country { get; set; } - - /// - /// 国家编码 - /// - public string CountryCode { get; set; } - - public string Currency { get; set; } - - public decimal? TotalPrice { get; set; } + public ShopifyUsedSaleOrderInfoDto ShopifyOrder { get; set; } } } \ No newline at end of file diff --git a/TradeManageNew/Models/ShopifyUsedSale/ShopifyUsedSaleOrderInfoDto.cs b/TradeManageNew/Models/ShopifyUsedSale/ShopifyUsedSaleOrderInfoDto.cs new file mode 100644 index 0000000..4999b70 --- /dev/null +++ b/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; } + + /// + /// 收件人 + /// + public string Name { get; set; } + + /// + /// 收件人电话 + /// + public string Phone { get; set; } + + /// + /// 完整地址 + /// + public string Full { get; set; } + + /// + /// 地址1 + /// + public string Detail { get; set; } + + /// + /// 地址2 + /// + public string Detail2 { get; set; } + + /// + /// 城市 + /// + public string City { get; set; } + + /// + /// 省 + /// + public string Province { get; set; } + + /// + /// 省编码 + /// + public string ProvinceCode { get; set; } + + /// + /// 邮编 + /// + public string Zip { get; set; } + + /// + /// 国家 + /// + public string Country { get; set; } + + /// + /// 国家编码 + /// + public string CountryCode { get; set; } + + public string Currency { get; set; } + + public decimal? TotalPrice { get; set; } + } +} \ No newline at end of file diff --git a/TradeManageNew/TradeManageNew.csproj b/TradeManageNew/TradeManageNew.csproj index 316ae1c..8e8aa23 100644 --- a/TradeManageNew/TradeManageNew.csproj +++ b/TradeManageNew/TradeManageNew.csproj @@ -2934,6 +2934,7 @@ + OrderAPI.ashx