From 24e60da6bfe24b67ed6d6aec2098a6db86f16817 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Mon, 3 Jul 2023 17:16:46 +0800 Subject: [PATCH] =?UTF-8?q?B=E7=AB=AF=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0I?= =?UTF-8?q?ntoStockType=EF=BC=8C=E8=AE=A2=E5=8D=95Sku=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.Business/Order/OrderBusiness.cs | 1 + .../Sync/OrderSyncBusiness.cs | 3 + BBWYB.Server.Model/Db/Order/Order.cs | 4 + BBWYB.Server.Model/Db/Order/OrderSku.cs | 137 +++++++++--------- .../Dto/Response/Order/OrderResponse.cs | 2 + BBWYB.Server.Model/Enums.cs | 8 + 6 files changed, 90 insertions(+), 65 deletions(-) diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 1e98780..c72b524 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -111,6 +111,7 @@ namespace BBWYB.Server.Business BuyerAccount = o.BuyerAccount, InPackAmount = o.InPackAmount, IsWaitPack = o.IsWaitPack, + IntoStoreType = o.IntoStoreType, ContactName = ocs.ContactName, Address = ocs.Address, diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs index 926bb4f..5659490 100644 --- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs @@ -126,6 +126,9 @@ namespace BBWYB.Server.Business.Sync if (jobject.ContainsKey("BelongSkus")) belongSkus = jobject["BelongSkus"] as JArray; + + if (jobject.ContainsKey("IntoStoreType")) + dbOrder.IntoStoreType = (Enums.IntoStoreType?)jobject.Value("IntoStoreType"); } catch (Exception ex) { diff --git a/BBWYB.Server.Model/Db/Order/Order.cs b/BBWYB.Server.Model/Db/Order/Order.cs index e83ca57..4f6863d 100644 --- a/BBWYB.Server.Model/Db/Order/Order.cs +++ b/BBWYB.Server.Model/Db/Order/Order.cs @@ -248,6 +248,10 @@ namespace BBWYB.Server.Model.Db /// [Column(DbType = "bit")] public bool? IsWaitPack { get; set; } = false; + + + [Column(MapType = typeof(int?))] + public Enums.IntoStoreType? IntoStoreType { get; set; } } } diff --git a/BBWYB.Server.Model/Db/Order/OrderSku.cs b/BBWYB.Server.Model/Db/Order/OrderSku.cs index cbab706..cedf9ec 100644 --- a/BBWYB.Server.Model/Db/Order/OrderSku.cs +++ b/BBWYB.Server.Model/Db/Order/OrderSku.cs @@ -7,67 +7,68 @@ namespace BBWYB.Server.Model.Db /// 订单SKU /// [Table(Name = "ordersku", DisableSyncStructure = true)] - public partial class OrderSku { + public partial class OrderSku + { - [Column(IsPrimary = true)] - public long Id { get; set; } + [Column(IsPrimary = true)] + public long Id { get; set; } - [Column(DbType = "datetime")] - public DateTime? CreateTime { get; set; } + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } - /// - /// 是否退款 - /// - - public bool? IsRefund { get; set; } = false; + /// + /// 是否退款 + /// + + public bool? IsRefund { get; set; } = false; + + /// + /// 销售数量 + /// + [Column(DbType = "int(1)")] + public int? ItemTotal { get; set; } + + /// + /// Logo + /// + public string Logo { get; set; } - /// - /// 销售数量 - /// - [Column(DbType = "int(1)")] - public int? ItemTotal { get; set; } - /// - /// Logo - /// - public string Logo { get; set; } + [Column(StringLength = 50)] + public string OrderId { get; set; } + /// + /// 销售单价 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? Price { get; set; } - [Column(StringLength = 50)] - public string OrderId { get; set; } + [Column(StringLength = 50)] + public string ProductId { get; set; } - /// - /// 销售单价 - /// - [Column(DbType = "decimal(20,2)")] - public decimal? Price { get; set; } + /// + /// 货号 + /// + [Column(StringLength = 50)] + public string ProductNo { get; set; } - [Column(StringLength = 50)] - public string ProductId { get; set; } - /// - /// 货号 - /// - [Column(StringLength = 50)] - public string ProductNo { get; set; } + public long? ShopId { get; set; } - - public long? ShopId { get; set; } + [Column(StringLength = 50, IsNullable = false)] + public string SkuId { get; set; } - [Column(StringLength = 50, IsNullable = false)] - public string SkuId { get; set; } + /// + /// 归属SkuId + /// + [Column(StringLength = 50)] + public string BelongSkuId { get; set; } - /// - /// 归属SkuId - /// - [Column(StringLength = 50)] - public string BelongSkuId { get; set; } + /// + /// Sku标题 + /// - /// - /// Sku标题 - /// - - public string Title { get; set; } + public string Title { get; set; } /// @@ -76,23 +77,29 @@ namespace BBWYB.Server.Model.Db [Column(DbType = "int(1)", MapType = typeof(int?))] public Enums.PackConfigState? PackConfigState { get; set; } - /// - /// 买家支付运费 - /// - [Column(DbType = "decimal(20,2)")] - public decimal? BuyerPayFreight { get; set; } = 0.00M; - - /// - /// 实收打包费 - /// - [Column(DbType = "decimal(20,2)")] - public decimal? InPackAmount { get; set; } = 0.00M; - - /// - /// SKU备注 - /// - [Column(StringLength = 500)] - public string Remark { get; set; } - } + /// + /// 买家支付运费 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? BuyerPayFreight { get; set; } = 0.00M; + + /// + /// 实收打包费 + /// + [Column(DbType = "decimal(20,2)")] + public decimal? InPackAmount { get; set; } = 0.00M; + + /// + /// SKU备注 + /// + [Column(StringLength = 500)] + public string Remark { get; set; } + + /// + /// 是否验收 + /// + [Column(DbType = "bit", IsNullable = true)] + public bool? IsCheck { get; set; } + } } diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs index 4c8933d..3c5e42a 100644 --- a/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs @@ -145,6 +145,8 @@ /// 打包状态 /// public Enums.PackConfigState? PackConfigState { get; set; } + + public Enums.IntoStoreType? IntoStoreType { get; set; } } public class OrderListResponse diff --git a/BBWYB.Server.Model/Enums.cs b/BBWYB.Server.Model/Enums.cs index f77cacf..55e68dc 100644 --- a/BBWYB.Server.Model/Enums.cs +++ b/BBWYB.Server.Model/Enums.cs @@ -307,5 +307,13 @@ 待配置 = 0, 已配置 = 1 } + + /// + /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1) + /// + public enum IntoStoreType + { + 发回齐越 = 0, 厂商代发入仓 = 1 + } } }