From 7447d1497621fd83e5795dc528f99b10e43084e1 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Fri, 12 May 2023 16:42:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Db/Order/OrderPurchaseInfo.cs | 33 +++++++++++++++++++ BBWYB.Server.Model/Db/Order/OrderSku.cs | 1 - .../Dto/Request/Order/OutStockRequest.cs | 21 ++++++++++++ .../Dto/Request/Order/QueryOrderRequest.cs | 33 +++++++++++++++++++ .../PurchaseOrder/CargoParamRequest.cs | 16 +++++++++ .../Request/PurchaseOrder/ConsigneeRequest.cs | 3 ++ .../PurchaseOrder/CreateOrderRequest.cs | 6 ++++ .../PurchaseOrder/PreviewOrderRequest.cs | 9 +++++ .../InputPurchaseSchemeProductRequest.cs | 12 +++++++ .../InputPurchaseSchemeProductSkuRequest.cs | 22 +++++++++---- .../InputPurchaseSchemeRequest.cs | 3 ++ .../PurchaseOrder/PreviewOrderResponse.cs | 2 +- BBWYB.Server.Model/Enums.cs | 10 +++--- SDKAdapter/AdapterEnums.cs | 3 ++ .../Request/Product/OP_QueryProductRequest.cs | 9 +++++ .../Product/OP_QueryProductSkuRequest.cs | 6 ++++ 16 files changed, 176 insertions(+), 13 deletions(-) diff --git a/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs b/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs index 68fe6e6..fdeb97a 100644 --- a/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs +++ b/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs @@ -15,41 +15,74 @@ namespace BBWYB.Server.Model.Db [Column(DbType = "datetime")] public DateTime? CreateTime { get; set; } + /// + /// 采购账号Id + /// [Column(StringLength = 100)] public string PurchaseAccountId { get; set; } + /// + /// 采购账号名称 + /// [Column(StringLength = 100)] public string PurchaseAccountName { get; set; } [Column(MapType = typeof(int?))] public Enums.PurchaseMethod? PurchaseMethod { get; set; } + /// + /// 采购单Id + /// [Column(StringLength = 100)] public string PurchaseOrderId { get; set; } [Column(MapType = typeof(int?))] public Enums.Platform? PurchasePlatform { get; set; } + /// + /// 采购商名称 + /// [Column(StringLength = 100)] public string PurchaserName { get; set; } + /// + /// 店铺Id + /// public long? ShopId { get; set; } + /// + /// 快递单号 + /// [Column(StringLength = 100)] public string WaybillNo { get; set; } + /// + /// 原始快递公司名称 + /// [Column(StringLength = 100)] public string SourceExpressName { get; set; } + /// + /// 原始快递公司Id + /// [Column(StringLength = 100)] public string SourceExpressId { get; set; } + /// + /// 目标快递公司名称 + /// [Column(StringLength = 100)] public string TargetExpressName { get; set; } + /// + /// 目标快递公司Id + /// [Column(StringLength = 100)] public string TargetExpressId { get; set; } + /// + /// 归属订单Sku + /// [Column(StringLength = 500)] public string BelongSkuIds { get; set; } } diff --git a/BBWYB.Server.Model/Db/Order/OrderSku.cs b/BBWYB.Server.Model/Db/Order/OrderSku.cs index 0aeacc6..81376b7 100644 --- a/BBWYB.Server.Model/Db/Order/OrderSku.cs +++ b/BBWYB.Server.Model/Db/Order/OrderSku.cs @@ -30,7 +30,6 @@ namespace BBWYB.Server.Model.Db /// /// Logo /// - public string Logo { get; set; } diff --git a/BBWYB.Server.Model/Dto/Request/Order/OutStockRequest.cs b/BBWYB.Server.Model/Dto/Request/Order/OutStockRequest.cs index 63653ae..cf11eca 100644 --- a/BBWYB.Server.Model/Dto/Request/Order/OutStockRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/Order/OutStockRequest.cs @@ -2,18 +2,39 @@ { public class OutStockRequest : PlatformRequest { + /// + /// 璁㈠崟Id + /// public string OrderId { get; set; } + /// + /// 閲囪喘鍗旾d + /// public string PurchaseOrderId { get; set; } + /// + /// 杩愬崟鍙 + /// public string WayBillNo { get; set; } + /// + /// 鍘熷揩閫掑叕鍙窱d + /// public string SourceExpressId { get; set; } + /// + /// 鍘熷揩閫掑叕鍙稿悕绉 + /// public string SourceExpressName { get; set; } + /// + /// 鐩爣蹇掑叕鍙窱d 鎵嬪姩鍑哄簱蹇呬紶 + /// public string TargetExpressId { get; set; } + /// + /// 鐩爣蹇掑叕鍙稿悕绉 鎵嬪姩鍑哄簱蹇呬紶 + /// public string TargetExpressName { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs index 4d1f01b..42b0be1 100644 --- a/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs @@ -6,28 +6,61 @@ /// public string OrderId { get; set; } + /// + /// 搴楅摵Id + /// public long? ShopId { get; set; } + /// + /// 寮濮嬫椂闂 + /// public DateTime? StartDate { get; set; } + /// + /// 缁撴潫鏃堕棿 + /// public DateTime? EndDate { get; set; } + /// + /// 璁㈠崟鐘舵 + /// public Enums.OrderState? OrderState { get; set; } + /// + /// 椤垫暟 璧峰1 + /// public int PageIndex { get; set; } + /// + /// 姣忛〉璁板綍鏁 + /// public int PageSize { get; set; } + /// + /// 鍟嗗搧Id(Spu) + /// public string ProductId { get; set; } public string Sku { get; set; } + /// + /// 涓夋柟璁㈠崟Id + /// public string ClientOrderId { get; set; } + /// + /// 閲囪喘鍗旾d + /// public string PurchaseOrderId { get; set; } + /// + /// 鏉ユ簮搴楅摵鍚 + /// public string SourceShopName { get; set; } + /// + /// 鏉ユ簮Sku + /// public string SourceSku { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs index 06b7e4f..4cc5ad2 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs @@ -11,8 +11,14 @@ /// public string SkuId { get; set; } + /// + /// SpecId 1688鐙湁 + /// public string SpecId { get; set; } + /// + /// 閲囪喘鏁伴噺 + /// public int Quantity { get; set; } /// @@ -27,10 +33,20 @@ } public class CargoParamGroupRequest { + /// + /// 閲囪喘鍟咺d + /// public string PurchaserId { get; set; } + /// + /// 閲囪喘鍟嗗悕绉 + /// public string PurchaserName { get; set; } + public Enums.Platform PurchasePlatform { get; set; } + /// + /// 閲囪喘鍟嗗搧鍒楄〃 + /// public IList CargoParamList { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/ConsigneeRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/ConsigneeRequest.cs index 7fd0730..6f550bb 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/ConsigneeRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/ConsigneeRequest.cs @@ -17,6 +17,9 @@ /// public string Mobile { get; set; } + /// + /// 璇︾粏鍦板潃 + /// public string Address { get; set; } /// diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs index 9dc05e7..830d491 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs @@ -2,6 +2,9 @@ { public class CreateOrderRequest: PreviewOrderRequest { + /// + /// 鎶ヤ环鎵╁睍淇℃伅 + /// public string Extensions { get; set; } public string Remark { get; set; } @@ -11,6 +14,9 @@ /// public string OrderId { get; set; } + /// + /// 搴楅摵Id + /// public long ShopId { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/PreviewOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/PreviewOrderRequest.cs index 80290a3..600af08 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/PreviewOrderRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/PreviewOrderRequest.cs @@ -4,12 +4,21 @@ namespace BBWYB.Server.Model.Dto { public class PreviewOrderRequest { + /// + /// 閲囪喘璐﹀彿鍒楄〃 + /// public IList PurchaseAccountList { get; set; } public Enums.PurchaseOrderMode PurchaseOrderMode { get; set; } + /// + /// 鏀惰揣浜轰俊鎭 + /// public ConsigneeRequest Consignee { get; set; } + /// + /// 閲囪喘鍙傛暟鍒楄〃(浠ラ噰璐晢鍒嗙粍) + /// public IList CargoParamGroupList { get; set; } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs index 499d604..3ffb384 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs @@ -6,9 +6,21 @@ namespace BBWYB.Server.Model.Dto { public class InputPurchaseSchemeProductRequest { + /// + /// 搴楅摵鍟嗗搧Id + /// public string ProductId { get; set; } + /// + /// 搴楅摵鍟嗗搧Skull + /// public string SkuId { get; set; } + /// + /// 閲囪喘鍟嗗搧id + /// public string PurchaseProductId { get; set; } + /// + /// 閲囪喘閾炬帴 + /// public string PurchaseUrl { get; set; } public IList PurchaseSchemeProductSkuList { get; set; } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs index bce5af9..9bdfd77 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs @@ -1,15 +1,25 @@ -锘縰sing System; -using System.Collections.Generic; -using System.Text; - -namespace BBWYB.Server.Model.Dto +锘縩amespace BBWYB.Server.Model.Dto { public class InputPurchaseSchemeProductSkuRequest - { + {/// + /// 搴楅摵鍟嗗搧Id + /// public string ProductId { get; set; } + /// + /// 搴楅摵鍟嗗搧Sku + /// public string SkuId { get; set; } + /// + /// 閲囪喘鍟嗗搧Id + /// public string PurchaseProductId { get; set; } + /// + /// 閲囪喘Sku + /// public string PurchaseSkuId { get; set; } + /// + /// 閲囪喘Ske SpecId (1688鐙湁) + /// public string PurchaseSkuSpecId { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs index fe6a956..6d07002 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs @@ -19,6 +19,9 @@ namespace BBWYB.Server.Model.Dto /// 閲囪喘鍟咺d /// public string PurchaserId { get; set; } + /// + /// 閲囪喘鍟嗗悕绉 + /// public string PurchaserName { get; set; } /// /// 閲囪喘鍟嗗彂璐у湴 diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs index 603bb80..913196f 100644 --- a/BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs @@ -18,7 +18,7 @@ public decimal FreightAmount { get; set; } /// - /// 鎵╁睍鏁版嵁 + /// 鎵╁睍鏁版嵁 涓嬪崟闇瑕 /// public string Extensions { get; set; } } diff --git a/BBWYB.Server.Model/Enums.cs b/BBWYB.Server.Model/Enums.cs index 978ba2d..8401161 100644 --- a/BBWYB.Server.Model/Enums.cs +++ b/BBWYB.Server.Model/Enums.cs @@ -3,7 +3,7 @@ public class Enums { /// - /// 鐢靛晢骞冲彴 + /// 鐢靛晢骞冲彴 娣樺疂 = 0,浜笢 = 1,闃块噷宸村反 = 2,鎷煎澶 = 3,寰俊 = 4,鎷虫帰 = 10 /// public enum Platform { @@ -16,7 +16,7 @@ } /// - /// 閲囪喘鏂瑰紡 + /// 閲囪喘鏂瑰紡 绾夸笂閲囪喘 = 0,绾夸笅閲囪喘 = 1 /// public enum PurchaseMethod { @@ -25,7 +25,7 @@ } /// - /// 閲囪喘鍗曟ā寮 + /// 閲囪喘鍗曟ā寮 鎵瑰彂 = 0,浠ｅ彂 = 1 /// public enum PurchaseOrderMode { @@ -71,7 +71,7 @@ } /// - /// 璁㈠崟鐘舵 + /// 璁㈠崟鐘舵 寰呬粯娆 = 0,绛夊緟閲囪喘 = 1,寰呭嚭搴 = 2,寰呮敹璐 = 3,宸插畬鎴 = 4,閿佸畾 = 5,宸插彇娑 = 6,鏆傚仠 = 7,宸查娆 = 8,Unknow = 100 /// public enum OrderState { @@ -154,7 +154,7 @@ } /// - /// 鎺掑簭鏃堕棿绫诲瀷 + /// 鎺掑簭鏃堕棿绫诲瀷 ModifyTime = 0, StartTime = 1 /// public enum SortTimeType { diff --git a/SDKAdapter/AdapterEnums.cs b/SDKAdapter/AdapterEnums.cs index 5d90d2a..83d34cf 100644 --- a/SDKAdapter/AdapterEnums.cs +++ b/SDKAdapter/AdapterEnums.cs @@ -2,6 +2,9 @@ { public class AdapterEnums { + /// + /// 鐢靛晢骞冲彴 娣樺疂 = 0,浜笢 = 1,闃块噷宸村反 = 2,鎷煎澶 = 3,寰俊 = 4,鎷虫帰 = 10 + /// public enum PlatformType { 娣樺疂 = 0, diff --git a/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs b/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs index 7889d8e..c26df80 100644 --- a/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs +++ b/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs @@ -9,10 +9,19 @@ /// public string ProductItem { get; set; } + /// + /// 浜у搧鍚嶇О + /// public string ProductName { get; set; } + /// + /// 椤电爜 璧峰1 + /// public int PageIndex { get; set; } + /// + /// 姣忛〉璁板綍鏁 + /// public int PageSize { get; set; } } } diff --git a/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs b/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs index e0330fd..d0b7b6b 100644 --- a/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs +++ b/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs @@ -12,8 +12,14 @@ /// public string Sku { get; set; } + /// + /// 椤电爜 璧峰1 + /// public int PageIndex { get; set; } + /// + /// 姣忛〉璁板綍鏁 + /// public int PageSize { get; set; } } }