From 3fda3f867879f4156341f87c7a8ede6eee4cbe58 Mon Sep 17 00:00:00 2001 From: wufan Date: Tue, 21 Jan 2025 13:05:44 +0800 Subject: [PATCH] :memo: --- TradeManageNew/DD_OrderServiceNew.asmx.cs | 25 ++++++++++++++++--- .../ShopifyUsedSale/OrderUsedSaleApplyDto.cs | 4 ++- .../Models/DT_OrderUsedSalePlatform.cs | 15 +++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs index 0407276..84e998f 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs @@ -29504,6 +29504,7 @@ namespace TradeManageNew x.IsDeleted == false) .Select(o => new OrderUsedSaleApplyDto { + Id = o.Id, UsedSaleBarCode = o.UsedSaleBarCode, ServiceType = o.ServiceType, TrackingCode = o.TrackingCode, @@ -29931,13 +29932,16 @@ namespace TradeManageNew foreach (var newOrderUsedSaleApply in newOrderUsedSaleApplyList) { - db.InsertWithInt32Identity(newOrderUsedSaleApply); + var id = db.InsertWithInt32Identity(newOrderUsedSaleApply); + + newOrderUsedSaleApply.Id = id; } } var orderUsedSaleApplyDtos = newOrderUsedSaleApplyList .Select(o => new OrderUsedSaleApplyDto { + Id = o.Id, UsedSaleBarCode = o.UsedSaleBarCode, ServiceType = o.ServiceType, TrackingCode = o.TrackingCode, @@ -30024,12 +30028,27 @@ namespace TradeManageNew return addressLines.ToArray(); } - public APIReturnModel OrderUsedSalePlatformSendOut(int Id ,TradeUsedSale.Enums.ShippingMethod shippingMethod ) + /// + /// 二手商品出库 + /// + /// + /// + public APIReturnModel SendOutOrderUsedSalePlatform(List Ids) { // PagesNew.Login(base.Session); using (var db = new TradeUsedSale.Repositories.ErpDbContext()) { - return null; + db.DT_OrderUsedSalePlatform + .Where(x => Ids.Contains(x.Id) && x.Status == UsedSalePlatformStatus.PendingPickup) + .Set(x => x.Status, UsedSalePlatformStatus.Sold) + .Update(); + + return new APIReturnModel + { + Code = 1, + Message = "Success", + Datas = null + }; } } diff --git a/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSaleApplyDto.cs b/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSaleApplyDto.cs index bd7a5d1..e2c6054 100644 --- a/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSaleApplyDto.cs +++ b/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSaleApplyDto.cs @@ -4,6 +4,8 @@ namespace TradeManageNew.Models.ShopifyUsedSale { public class OrderUsedSaleApplyDto { + public int Id { get; set; } + /// /// 二手售卖商品打印条码 /// @@ -23,7 +25,7 @@ namespace TradeManageNew.Models.ShopifyUsedSale /// 运费 /// public decimal TotalNetCharge { get; set; } - + /// /// 创建时间 /// diff --git a/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs b/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs index 1535256..9e3699f 100644 --- a/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs +++ b/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs @@ -102,5 +102,20 @@ namespace TradeUsedSale.Repositories.Models /// 推送至平台信息 /// public string PublishMessage { get; set; } + + /// + /// 服务类型 + /// + public string ServiceType { get; set; } + + /// + /// 跟踪号 + /// + public string TrackingCode { get; set; } + + /// + /// 运费 + /// + public decimal TotalNetCharge { get; set; } } } \ No newline at end of file