临时提交

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;

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;

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;

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;

BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@@ -143,6 +143,7 @@ namespace BBWYB.Server.Business.Sync
                 List<SpuTotalSaleInfo> insertSpuTotalSaleInfoList = new List<SpuTotalSaleInfo>();
                 IList<SpuTotalSaleInfo> updateSpuTotalSaleInfoList = new List<SpuTotalSaleInfo>();
 
+                List<>
                 List<SkuOptimizationTask> insertSkuOptimizationTaskList = new List<SkuOptimizationTask>();
                 List<SkuOptimizationChildTask> insertSkuOptimizationChildTaskList = new List<SkuOptimizationChildTask>();
                 #endregion

BBWYB.Server.Model/Db/Product/Skuoptimizationtask.cs

@@ -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; }
-
-        /// <summary>
-        /// 完成优化时间
-        /// </summary>
-        [Column(DbType = "datetime")]
-        public DateTime? CompletionTime { get; set; }
-
-        [Column(DbType = "datetime")]
-        public DateTime? CreateTime { get; set; }
-
-        /// <summary>
-        /// 上次优化时间(优化完成后首次采购的时间)
-        /// </summary>
-        [Column(DbType = "datetime")]
-        public DateTime? LastOptimizationTime { get; set; }
-
-        /// <summary>
-        /// 是否完成优化
-        /// </summary>
-        public bool? IsOptimizationCompleted { get; set; } = false;
-
-        /// <summary>
-        /// 是否完成采购
-        /// </summary>
-        public bool? IsPurchasementCompleted { get; set; } = false;
-
-        [Column(StringLength = 50)]
-        public string JDSkuId { get; set; }
-
-        /// <summary>
-        /// 预估需求量
-        /// </summary>
-        [Column(DbType = "int")]
-        public int? PreItemCount { get; set; } = 0;
-
-        /// <summary>
-        /// 预估采购金额
-        /// </summary>
-        [Column(DbType = "decimal(18,2)")]
-        public decimal? PrePurchasedAmount { get; set; } = 0.00M;
-
-        [Column(StringLength = 50)]
-        public string ProductId { get; set; }
-
-        /// <summary>
-        /// 距离安全预警天数
-        /// </summary>
-        [Column(DbType = "int")]
-        public int? SafeWarningRemainingDay { get; set; } = 0;
-
-        [Column(DbType = "bigint")]
-        public long? ShopId { get; set; }
-
-        /// <summary>
-        /// 来源店铺名
-        /// </summary>
-        [Column(StringLength = 50)]
-        public string BelongShopName { get; set; }
-
-        [Column(StringLength = 50)]
-        public string SkuId { get; set; }
-
-        /// <summary>
-        /// 触发优化原因 首次采购 = 0, 首次优化 = 1, 再次优化 = 2
-        /// </summary>
-        [Column(DbType = "int", MapType = typeof(int))]
-        public Enums.TriggerOptimizationReason? TriggerOptimizationReason { get; set; } = 0;
-
-
-        /// <summary>
-        /// 上次优化率
-        /// </summary>
-        [Column(DbType = "decimal(18,2)")]
-        public decimal? LastOptimizationRatio { get; set; } = 0.00M;
-
-        /// <summary>
-        /// 上次采购单价
-        /// </summary>
-        [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
-    }
-
-}

BBWYB.Server.Model/Db/SpuOptimization/Skuoptimizationtask.cs

@@ -0,0 +1,51 @@
+using FreeSql.DataAnnotations;
+
+namespace BBWYB.Server.Model.Db
+{
+
+    /// <summary>
+    /// Sku优化任务表
+    /// </summary>
+    [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; }
+
+        /// <summary>
+        /// 预估件数;预估件数
+        /// </summary>
+        [Column(DbType = "int")]
+        public int? PreItemCount { get; set; }
+
+        /// <summary>
+        /// 预估采购金额;预估采购金额
+        /// </summary>
+        [Column(DbType = "decimal(18,2)")]
+        public decimal? PrePurchaseAmount { get; set; }
+
+        /// <summary>
+        /// 预估Sku数;预估Sku数
+        /// </summary>
+        [Column(DbType = "int")]
+        public int? PreSkuCount { get; set; }
+
+        [Column(StringLength = 50)]
+        public string QTSkuId { get; set; }
+
+        /// <summary>
+        /// Spu优化任务Id;Spu优化任务Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? SpuOptimizationTaskId { get; set; }
+
+    }
+
+}

BBWYB.Server.Model/Db/Product/Skuoptimizationchildtask.cs → 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
+    /// <summary>
+    /// SPU优化议价组任务表
+    /// </summary>
+    [Table(Name = "spuoptimizationbargainteamtask", DisableSyncStructure = true)]
+    public partial class SpuOptimizationBargainTeamTask
     {
 
         [Column(DbType = "bigint", IsPrimary = true)]
         public long Id { get; set; }
 
         /// <summary>
-        /// 团队Id (议价组Id)
+        /// 团队Id (议价组Id);团队Id (议价组Id)
         /// </summary>
         [Column(StringLength = 50)]
         public string BelongTeamId { get; set; }
 
         /// <summary>
-        /// 团队Name (议价组Name)
+        /// 议价组名称;议价组名称
         /// </summary>
         [Column(StringLength = 50)]
         public string BelongTeamName { get; set; }
 
         /// <summary>
-        /// 完成时间
+        /// 完成时间;完成时间
         /// </summary>
         [Column(DbType = "datetime")]
         public DateTime? CompletionTime { get; set; }
 
         /// <summary>
-        /// 是否优化完成
+        /// 是否优化完成;是否优化完成
         /// </summary>
-        public bool? IsOptimizationCompleted { get; set; } = false;
+        public bool? IsOptimizationCompleted { get; set; }
 
         /// <summary>
-        /// 优化任务Id
+        /// Spu优化任务Id
         /// </summary>
         [Column(DbType = "bigint")]
-        public long OptimizationTaskId { get; set; }
+        public long? SpuOptimizationTaskId { get; set; }
 
     }
 

BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationcompetitivetendertask.cs

@@ -0,0 +1,59 @@
+using FreeSql.DataAnnotations;
+
+namespace BBWYB.Server.Model.Db
+{
+
+    /// <summary>
+    /// SPU优化竞标任务表
+    /// </summary>
+    [Table(Name = "spuoptimizationcompetitivetendertask", DisableSyncStructure = true)]
+    public partial class SpuOptimizationCompetitiveTenderTask
+    {
+
+        [Column(IsPrimary = true, IsNullable = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 议价组Id;议价组Id
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string BargainTeamId { get; set; }
+
+        [Column(DbType = "datetime")]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 是否更新报价;是否更新报价
+        /// </summary>
+        public bool? IsUpdateQuotedPrice { get; set; } = false;
+
+        /// <summary>
+        /// 采购方案分组Id;采购方案分组Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? SchemeGroupId { get; set; }
+
+        /// <summary>
+        /// 采购方案Id;采购方案Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? SchemeId { get; set; }
+
+        [Column(StringLength = 50)]
+        public string SkuId { get; set; }
+
+        /// <summary>
+        /// Spu优化议价组任务Id;Spu优化议价组任务Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? SpuOptimizationBargainTeamTaskId { get; set; }
+
+        /// <summary>
+        /// Spu优化任务Id;Spu优化任务Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? SpuOptimizationTaskId { get; set; }
+
+    }
+
+}

BBWYB.Server.Model/Db/SpuOptimization/Spuoptimizationtask.cs

@@ -0,0 +1,89 @@
+using FreeSql.DataAnnotations;
+
+namespace BBWYB.Server.Model.Db
+{
+
+    /// <summary>
+    /// SPU优化任务表
+    /// </summary>
+    [Table(Name = "spuoptimizationtask", DisableSyncStructure = true)]
+    public partial class SpuOptimizationTask
+    {
+
+        /// <summary>
+        /// 待优化任务Id;待优化任务Id
+        /// </summary>
+        [Column(DbType = "bigint", IsPrimary = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 需求方店铺Id;需求方店铺Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? BelongShopId { get; set; }
+
+        /// <summary>
+        /// 需求方店铺名称;需求方店铺名称
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string BelongShopName { get; set; }
+
+        /// <summary>
+        /// 完成优化时间;完成优化时间
+        /// </summary>
+        [Column(DbType = "datetime")]
+        public DateTime? CompletionTime { get; set; }
+
+        /// <summary>
+        /// 创建时间;创建时间
+        /// </summary>
+        [Column(DbType = "datetime")]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 是否优化完成;是否优化完成
+        /// </summary>
+        public bool? IsOptimizationCompleted { get; set; }
+
+        [Column(StringLength = 50)]
+        public string JDSpuId { get; set; }
+
+        /// <summary>
+        /// 上次优化时间;上次优化时间
+        /// </summary>
+        [Column(DbType = "datetime")]
+        public DateTime? LastOptimizationTime { get; set; }
+
+        /// <summary>
+        /// 预估件数;预估件数
+        /// </summary>
+        [Column(DbType = "int")]
+        public int? PreItemCount { get; set; }
+
+        /// <summary>
+        /// 预估采购金额;预估采购金额
+        /// </summary>
+        [Column(DbType = "decimal(18,2)")]
+        public decimal? PrePurchaseAmount { get; set; }
+
+        /// <summary>
+        /// 预估Sku数;预估Sku数
+        /// </summary>
+        [Column(DbType = "int")]
+        public int? PreSkuCount { get; set; }
+
+        /// <summary>
+        /// 店铺Id;店铺Id
+        /// </summary>
+        [Column(DbType = "bigint")]
+        public long? ShopId { get; set; }
+
+        /// <summary>
+        /// 触发优化原因 首次采购 = 0, 首次优化 = 1, 再次优化 = 2;触发优化原因 首次采购 = 0, 首次优化 = 1, 再次优化 = 2
+        /// </summary>
+        [Column(DbType = "int")]
+        public int? TriggerOptimizationReason { get; set; }
+
+    }
+
+}

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
 {