From 60fbc1aa1a94506acc6e0dc16d848591d1e5a9d0 Mon Sep 17 00:00:00 2001 From: wufan Date: Mon, 20 Jan 2025 16:37:25 +0800 Subject: [PATCH] :memo: --- TradeManageNew/DD_OrderServiceNew.asmx.cs | 50 ++++++++++++++++++- .../OrderUsedSalePlatformPageDto.cs | 5 ++ TradeUsedSale/Enums/UsedSalePlatformStatus.cs | 4 +- .../Models/DT_OrderUsedSalePlatform.cs | 5 ++ 4 files changed, 61 insertions(+), 3 deletions(-) diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs index 50141a6..b55683d 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs @@ -28745,6 +28745,7 @@ namespace TradeManageNew ImageUrls = JsonConvert.DeserializeObject>(pageItem.ImageUrls), ShippingMethod = pageItem.ShippingMethod, IsNew = pageItem.IsNew, + AppointmentTime = pageItem.AppointmentTime, CreationTime = pageItem.CreationTime, CreatorId = pageItem.CreatorId, PublishMessage = pageItem.PublishMessage, @@ -29954,7 +29955,54 @@ namespace TradeManageNew }; } } - + + /// + /// 自提填写预约时间 + /// + /// + /// + /// + [WebMethod(EnableSession = true)] + public APIReturnModel SelfPickupOrderUsedSalePlatform(int Id, DateTime? appointmentTime) + { + // PagesNew.Login(base.Session); + using (var db = new TradeUsedSale.Repositories.ErpDbContext()) + { + var orderUsedSalePlatform = db.DT_OrderUsedSalePlatform.FirstOrDefault(x => x.Id == Id); + + if (orderUsedSalePlatform is null) + { + return new APIReturnModel + { + Code = 0, + Message = $"不存在Id为{Id}的二手售卖商品", + Datas = null + }; + } + + if (orderUsedSalePlatform.ShippingMethod != ShippingMethod.SelfPickup) + { + return new APIReturnModel + { + Code = 0, + Message = $"Barcode[{orderUsedSalePlatform.BarCode}]非自提订单", + Datas = null + }; + } + + db.DT_OrderUsedSalePlatform.Where(x => x.Id == Id) + .Set(x => x.AppointmentTime, value: appointmentTime) + .Update(); + + return new APIReturnModel + { + Code = 1, + Message = "Success", + Datas = null + }; + } + } + static string[] SplitAddress(string address, int maxLength) { List addressLines = new List(); diff --git a/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs b/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs index 9b96aa7..3941c0f 100644 --- a/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs +++ b/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs @@ -81,6 +81,11 @@ namespace TradeManageNew.Models.ShopifyUsedSale /// 是否全新 /// public bool? IsNew { get; set; } + + /// + /// 预约时间 + /// + public DateTime? AppointmentTime { get; set; } /// /// 创建时间 diff --git a/TradeUsedSale/Enums/UsedSalePlatformStatus.cs b/TradeUsedSale/Enums/UsedSalePlatformStatus.cs index 9c5eb32..717227a 100644 --- a/TradeUsedSale/Enums/UsedSalePlatformStatus.cs +++ b/TradeUsedSale/Enums/UsedSalePlatformStatus.cs @@ -15,9 +15,9 @@ namespace TradeUsedSale.Enums [Description("已上架")] Listed, /// - /// 等待取货 + /// 待发货 /// - [Description("等待取货")] PendingPickup, + [Description("待发货")] PendingPickup, /// /// 售卖完成 diff --git a/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs b/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs index cc1849f..1535256 100644 --- a/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs +++ b/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs @@ -73,6 +73,11 @@ namespace TradeUsedSale.Repositories.Models /// public bool? IsNew { get; set; } + /// + /// 预约时间 + /// + public DateTime? AppointmentTime { get; set; } + /// /// 创建时间 ///