From 99fda22339d14d90db1401c63b9128eda36dd7b1 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 5 Mar 2024 22:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataRepair/DataRepairBusiness.cs | 1 + BBWYB.Server.Business/Order/OrderBusiness.cs | 1 + .../PurchaseOrder/PurchaseOrderBusiness.cs | 1 + .../SkuOptimizationBusiness.cs | 4 +- .../Sync/OrderSyncBusiness.cs | 1 + .../Db/Product/Skuoptimizationtask.cs | 140 ------------------ .../Skuoptimizationhistory.cs | 0 .../Db/SpuOptimization/Skuoptimizationtask.cs | 51 +++++++ .../Spuoptimizationbargainteamtask.cs} | 21 +-- .../Spuoptimizationcompetitivetendertask.cs | 59 ++++++++ .../Db/SpuOptimization/Spuoptimizationtask.cs | 89 +++++++++++ .../Product/SkuOptimizationHistoryResponse.cs | 2 +- 12 files changed, 218 insertions(+), 152 deletions(-) delete mode 100644 BBWYB.Server.Model/Db/Product/Skuoptimizationtask.cs rename BBWYB.Server.Model/Db/{Product => SpuOptimization}/Skuoptimizationhistory.cs (100%) create mode 100644 BBWYB.Server.Model/Db/SpuOptimization/Skuoptimizationtask.cs rename BBWYB.Server.Model/Db/{Product/Skuoptimizationchildtask.cs => SpuOptimization/Spuoptimizationbargainteamtask.cs} (56%) create mode 100644 BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationcompetitivetendertask.cs create mode 100644 BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationtask.cs diff --git a/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs b/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs index 3960818..b496ecf 100644 --- a/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs +++ b/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs @@ -5,6 +5,7 @@ using BBWYB.Common.Models; using BBWYB.Server.Model; using BBWYB.Server.Model.Db; using BBWYB.Server.Model.Db.HY; +using BBWYB.Server.Model.Db.SpuOptimization; using BBWYB.Server.Model.Dto; using FreeSql; using Newtonsoft.Json.Linq; diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 1f08dec..7e0e998 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -5,6 +5,7 @@ using BBWYB.Common.Models; using BBWYB.Server.Business.Extensions; using BBWYB.Server.Model; using BBWYB.Server.Model.Db; +using BBWYB.Server.Model.Db.SpuOptimization; using BBWYB.Server.Model.Dto; using FreeSql; using Microsoft.Extensions.DependencyInjection; diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 8b0e730..71b1f90 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -8,6 +8,7 @@ using BBWYB.Server.Model.Core; using BBWYB.Server.Model.Db; using BBWYB.Server.Model.Db.Mds; using BBWYB.Server.Model.Db.MDS; +using BBWYB.Server.Model.Db.SpuOptimization; using BBWYB.Server.Model.Dto; using FreeSql; using Microsoft.Extensions.DependencyInjection; diff --git a/BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs index ccbf601..c48cf22 100644 --- a/BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs @@ -11,14 +11,14 @@ using Yitter.IdGenerator; namespace BBWYB.Server.Business { - public class SkuOptimizationBusiness : BaseBusiness, IDenpendency + public class OptimizationBusiness : BaseBusiness, IDenpendency { private FreeSqlMultiDBManager fsqlManager; private VenderBusiness venderBusiness; private TimeLimitRules timeLimitRules; private UserBusiness userBusiness; - public SkuOptimizationBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator, FreeSqlMultiDBManager fsqlManager, VenderBusiness venderBusiness, TimeLimitRules timeLimitRules, UserBusiness userBusiness) : base(fsql, nLogManager, idGenerator) + public OptimizationBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator, FreeSqlMultiDBManager fsqlManager, VenderBusiness venderBusiness, TimeLimitRules timeLimitRules, UserBusiness userBusiness) : base(fsql, nLogManager, idGenerator) { this.fsqlManager = fsqlManager; this.venderBusiness = venderBusiness; diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs index c4856f4..c4eea87 100644 --- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs @@ -143,6 +143,7 @@ namespace BBWYB.Server.Business.Sync List insertSpuTotalSaleInfoList = new List(); IList updateSpuTotalSaleInfoList = new List(); + List<> List insertSkuOptimizationTaskList = new List(); List insertSkuOptimizationChildTaskList = new List(); #endregion diff --git a/BBWYB.Server.Model/Db/Product/Skuoptimizationtask.cs b/BBWYB.Server.Model/Db/Product/Skuoptimizationtask.cs deleted file mode 100644 index 01259a1..0000000 --- a/BBWYB.Server.Model/Db/Product/Skuoptimizationtask.cs +++ /dev/null @@ -1,140 +0,0 @@ -using FreeSql.DataAnnotations; - -namespace BBWYB.Server.Model.Db -{ - - [Table(Name = "skuoptimizationtask", DisableSyncStructure = true)] - public partial class SkuOptimizationTask - { - [Column(DbType = "bigint", IsPrimary = true)] - public long Id { get; set; } - - /// - /// 完成优化时间 - /// - [Column(DbType = "datetime")] - public DateTime? CompletionTime { get; set; } - - [Column(DbType = "datetime")] - public DateTime? CreateTime { get; set; } - - /// - /// 上次优化时间(优化完成后首次采购的时间) - /// - [Column(DbType = "datetime")] - public DateTime? LastOptimizationTime { get; set; } - - /// - /// 是否完成优化 - /// - public bool? IsOptimizationCompleted { get; set; } = false; - - /// - /// 是否完成采购 - /// - public bool? IsPurchasementCompleted { get; set; } = false; - - [Column(StringLength = 50)] - public string JDSkuId { get; set; } - - /// - /// 预估需求量 - /// - [Column(DbType = "int")] - public int? PreItemCount { get; set; } = 0; - - /// - /// 预估采购金额 - /// - [Column(DbType = "decimal(18,2)")] - public decimal? PrePurchasedAmount { get; set; } = 0.00M; - - [Column(StringLength = 50)] - public string ProductId { get; set; } - - /// - /// 距离安全预警天数 - /// - [Column(DbType = "int")] - public int? SafeWarningRemainingDay { get; set; } = 0; - - [Column(DbType = "bigint")] - public long? ShopId { get; set; } - - /// - /// 来源店铺名 - /// - [Column(StringLength = 50)] - public string BelongShopName { get; set; } - - [Column(StringLength = 50)] - public string SkuId { get; set; } - - /// - /// 触发优化原因 首次采购 = 0, 首次优化 = 1, 再次优化 = 2 - /// - [Column(DbType = "int", MapType = typeof(int))] - public Enums.TriggerOptimizationReason? TriggerOptimizationReason { get; set; } = 0; - - - /// - /// 上次优化率 - /// - [Column(DbType = "decimal(18,2)")] - public decimal? LastOptimizationRatio { get; set; } = 0.00M; - - /// - /// 上次采购单价 - /// - [Column(DbType = "decimal(18,2)")] - public decimal? LastPurchasePrice { get; set; } = 0.00M; - - - - #region Extension - - #region TimeLimitTask - [Column(IsIgnore = true)] - public long TimeLimitTaskId { get; set; } - - [Column(IsIgnore = true)] - public DateTime? TimeLimitTaskCompletionTime { get; set; } - - [Column(IsIgnore = true)] - public DateTime? TimeLimitTaskCreateTme { get; set; } - - [Column(IsIgnore = true)] - public DateTime? TimeLimitTaskPayTime { get; set; } - - [Column(IsIgnore = true)] - public DateTime? TimeLimitTaskExpirationTime { get; set; } - - [Column(IsIgnore = true)] - public bool? TimeLimitTaskIsTimely { get; set; } - - [Column(IsIgnore = true)] - public string TimeLimitTaskOrderId { get; set; } - - [Column(IsIgnore = true)] - public string TimeLimitTaskOrderSn { get; set; } - - [Column(IsIgnore = true)] - public long? TimeLimitTaskShopId { get; set; } - - [Column(IsIgnore = true)] - public string TimeLimitTaskSkuId { get; set; } - - [Column(IsIgnore = true)] - public Enums.TimeLimitTaskType? TimeLimitTaskTaskType { get; set; } - - [Column(IsIgnore = true)] - public string TimeLimitTaskRemark { get; set; } - - [Column(IsIgnore = true)] - public long TimeLimitTaskBelongTaskId { get; set; } - #endregion - - #endregion - } - -} diff --git a/BBWYB.Server.Model/Db/Product/Skuoptimizationhistory.cs b/BBWYB.Server.Model/Db/SpuOptimization/Skuoptimizationhistory.cs similarity index 100% rename from BBWYB.Server.Model/Db/Product/Skuoptimizationhistory.cs rename to BBWYB.Server.Model/Db/SpuOptimization/Skuoptimizationhistory.cs diff --git a/BBWYB.Server.Model/Db/SpuOptimization/Skuoptimizationtask.cs b/BBWYB.Server.Model/Db/SpuOptimization/Skuoptimizationtask.cs new file mode 100644 index 0000000..dc53051 --- /dev/null +++ b/BBWYB.Server.Model/Db/SpuOptimization/Skuoptimizationtask.cs @@ -0,0 +1,51 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + /// + /// Sku优化任务表 + /// + [Table(Name = "skuoptimizationtask", DisableSyncStructure = true)] + public partial class SkuOptimizationTask + { + + [Column(DbType = "bigint", IsPrimary = true)] + public long Id { get; set; } + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + [Column(StringLength = 50)] + public string JDSkuId { get; set; } + + /// + /// 预估件数;预估件数 + /// + [Column(DbType = "int")] + public int? PreItemCount { get; set; } + + /// + /// 预估采购金额;预估采购金额 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? PrePurchaseAmount { get; set; } + + /// + /// 预估Sku数;预估Sku数 + /// + [Column(DbType = "int")] + public int? PreSkuCount { get; set; } + + [Column(StringLength = 50)] + public string QTSkuId { get; set; } + + /// + /// Spu优化任务Id;Spu优化任务Id + /// + [Column(DbType = "bigint")] + public long? SpuOptimizationTaskId { get; set; } + + } + +} diff --git a/BBWYB.Server.Model/Db/Product/Skuoptimizationchildtask.cs b/BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationbargainteamtask.cs similarity index 56% rename from BBWYB.Server.Model/Db/Product/Skuoptimizationchildtask.cs rename to BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationbargainteamtask.cs index 9e141c6..810e234 100644 --- a/BBWYB.Server.Model/Db/Product/Skuoptimizationchildtask.cs +++ b/BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationbargainteamtask.cs @@ -3,41 +3,44 @@ namespace BBWYB.Server.Model.Db { - [Table(Name = "skuoptimizationchildtask", DisableSyncStructure = true)] - public partial class SkuOptimizationChildTask + /// + /// SPU优化议价组任务表 + /// + [Table(Name = "spuoptimizationbargainteamtask", DisableSyncStructure = true)] + public partial class SpuOptimizationBargainTeamTask { [Column(DbType = "bigint", IsPrimary = true)] public long Id { get; set; } /// - /// 团队Id (议价组Id) + /// 团队Id (议价组Id);团队Id (议价组Id) /// [Column(StringLength = 50)] public string BelongTeamId { get; set; } /// - /// 团队Name (议价组Name) + /// 议价组名称;议价组名称 /// [Column(StringLength = 50)] public string BelongTeamName { get; set; } /// - /// 完成时间 + /// 完成时间;完成时间 /// [Column(DbType = "datetime")] public DateTime? CompletionTime { get; set; } /// - /// 是否优化完成 + /// 是否优化完成;是否优化完成 /// - public bool? IsOptimizationCompleted { get; set; } = false; + public bool? IsOptimizationCompleted { get; set; } /// - /// 优化任务Id + /// Spu优化任务Id /// [Column(DbType = "bigint")] - public long OptimizationTaskId { get; set; } + public long? SpuOptimizationTaskId { get; set; } } diff --git a/BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationcompetitivetendertask.cs b/BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationcompetitivetendertask.cs new file mode 100644 index 0000000..6c0c73a --- /dev/null +++ b/BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationcompetitivetendertask.cs @@ -0,0 +1,59 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + /// + /// SPU优化竞标任务表 + /// + [Table(Name = "spuoptimizationcompetitivetendertask", DisableSyncStructure = true)] + public partial class SpuOptimizationCompetitiveTenderTask + { + + [Column(IsPrimary = true, IsNullable = false)] + public string Id { get; set; } + + /// + /// 议价组Id;议价组Id + /// + [Column(StringLength = 50)] + public string BargainTeamId { get; set; } + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 是否更新报价;是否更新报价 + /// + public bool? IsUpdateQuotedPrice { get; set; } = false; + + /// + /// 采购方案分组Id;采购方案分组Id + /// + [Column(DbType = "bigint")] + public long? SchemeGroupId { get; set; } + + /// + /// 采购方案Id;采购方案Id + /// + [Column(DbType = "bigint")] + public long? SchemeId { get; set; } + + [Column(StringLength = 50)] + public string SkuId { get; set; } + + /// + /// Spu优化议价组任务Id;Spu优化议价组任务Id + /// + [Column(DbType = "bigint")] + public long? SpuOptimizationBargainTeamTaskId { get; set; } + + /// + /// Spu优化任务Id;Spu优化任务Id + /// + [Column(DbType = "bigint")] + public long? SpuOptimizationTaskId { get; set; } + + } + +} diff --git a/BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationtask.cs b/BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationtask.cs new file mode 100644 index 0000000..41f971a --- /dev/null +++ b/BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationtask.cs @@ -0,0 +1,89 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + /// + /// SPU优化任务表 + /// + [Table(Name = "spuoptimizationtask", DisableSyncStructure = true)] + public partial class SpuOptimizationTask + { + + /// + /// 待优化任务Id;待优化任务Id + /// + [Column(DbType = "bigint", IsPrimary = true)] + public long Id { get; set; } + + /// + /// 需求方店铺Id;需求方店铺Id + /// + [Column(DbType = "bigint")] + public long? BelongShopId { get; set; } + + /// + /// 需求方店铺名称;需求方店铺名称 + /// + [Column(StringLength = 50)] + public string BelongShopName { get; set; } + + /// + /// 完成优化时间;完成优化时间 + /// + [Column(DbType = "datetime")] + public DateTime? CompletionTime { get; set; } + + /// + /// 创建时间;创建时间 + /// + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 是否优化完成;是否优化完成 + /// + public bool? IsOptimizationCompleted { get; set; } + + [Column(StringLength = 50)] + public string JDSpuId { get; set; } + + /// + /// 上次优化时间;上次优化时间 + /// + [Column(DbType = "datetime")] + public DateTime? LastOptimizationTime { get; set; } + + /// + /// 预估件数;预估件数 + /// + [Column(DbType = "int")] + public int? PreItemCount { get; set; } + + /// + /// 预估采购金额;预估采购金额 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? PrePurchaseAmount { get; set; } + + /// + /// 预估Sku数;预估Sku数 + /// + [Column(DbType = "int")] + public int? PreSkuCount { get; set; } + + /// + /// 店铺Id;店铺Id + /// + [Column(DbType = "bigint")] + public long? ShopId { get; set; } + + /// + /// 触发优化原因 首次采购 = 0, 首次优化 = 1, 再次优化 = 2;触发优化原因 首次采购 = 0, 首次优化 = 1, 再次优化 = 2 + /// + [Column(DbType = "int")] + public int? TriggerOptimizationReason { get; set; } + + } + +} diff --git a/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs b/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs index b32d4bc..f08893f 100644 --- a/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs @@ -1,4 +1,4 @@ -using BBWYB.Server.Model.Db; +using BBWYB.Server.Model.Db.SpuOptimization; namespace BBWYB.Server.Model.Dto {