From dd6246bd33bebb05046fd37138b2c91dc9f1109d Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 5 Mar 2024 15:37:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= 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 | 26 ++--- .../SkuOptimizationBusiness.cs | 1 - .../Sync/OrderSyncBusiness.cs | 98 +++++++++---------- .../Skuoptimizationchildtask.cs | 0 .../Skuoptimizationhistory.cs | 0 .../Skuoptimizationtask.cs | 0 .../SkuOptimizationCompetitiveTenderTask.cs | 66 ------------- .../SkuOptimizationChildTaskResponse.cs | 2 +- .../SkuOptimizationTaskResponse.cs | 1 - .../Product/SkuOptimizationHistoryResponse.cs | 2 +- BBWYB.Server.Model/MappingProfiles.cs | 1 - 13 files changed, 65 insertions(+), 134 deletions(-) rename BBWYB.Server.Model/Db/{SkuOptimization => Product}/Skuoptimizationchildtask.cs (100%) rename BBWYB.Server.Model/Db/{SkuOptimization => Product}/Skuoptimizationhistory.cs (100%) rename BBWYB.Server.Model/Db/{SkuOptimization => Product}/Skuoptimizationtask.cs (100%) delete mode 100644 BBWYB.Server.Model/Db/SkuOptimization/SkuOptimizationCompetitiveTenderTask.cs diff --git a/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs b/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs index ed88de9..3960818 100644 --- a/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs +++ b/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs @@ -5,7 +5,6 @@ using BBWYB.Common.Models; using BBWYB.Server.Model; using BBWYB.Server.Model.Db; using BBWYB.Server.Model.Db.HY; -using BBWYB.Server.Model.Db.SkuOptimization; 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 1ebb773..1f08dec 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -5,7 +5,6 @@ using BBWYB.Common.Models; using BBWYB.Server.Business.Extensions; using BBWYB.Server.Model; using BBWYB.Server.Model.Db; -using BBWYB.Server.Model.Db.SkuOptimization; 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 bbeacb0..8b0e730 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -8,7 +8,6 @@ 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.SkuOptimization; using BBWYB.Server.Model.Dto; using FreeSql; using Microsoft.Extensions.DependencyInjection; @@ -581,7 +580,7 @@ namespace BBWYB.Server.Business var dbSkuAndPurchaserRelationList = fsql.Select() .Where(spr => purchaserIdList.Contains(spr.PurchaserId) && spr.ShopId == request.ShopId) .ToList(); - + var dbPurchaserList = fsql.Select(purchaserIdList).ToList(); foreach (var purchaserId in purchaserIdList) { purchaserSkuDictionary.TryGetValue(purchaserId, out var fromRequestSkuList); @@ -602,10 +601,15 @@ namespace BBWYB.Server.Business SkuId = x })); } - //var update = fsql.Update(purchaserId) - // .Set(p => p.PurchasedCount + 1) - // .SetIf(newSkuRelationCount > 0, p => p.PurchasedSkuCount + newSkuRelationCount); - //updatePurchaserList.Add(update); + + #region 更新采购商归属 + var purchaser = dbPurchaserList.FirstOrDefault(p => p.Id == purchaserId); + if (purchaser != null && !string.IsNullOrEmpty(purchaser.BelongBargainTeamId) && purchaser.BelongType == Enums.PurchaserBelongType.临时) + { + var updatePurchaser = fsql.Update(purchaserId).Set(p => p.BelongType, Enums.PurchaserBelongType.永久); + updatePurchaserList.Add(updatePurchaser); + } + #endregion } } @@ -794,11 +798,11 @@ namespace BBWYB.Server.Business if (updateSkuOptimizationPurhcasementByIdList.Count() > 0) fsql.Update(updateSkuOptimizationPurhcasementByIdList).Set(s => s.IsPurchasementCompleted, true).ExecuteAffrows(); - //if (updatePurchaserList.Count() > 0) - //{ - // foreach (var update in updatePurchaserList) - // update.ExecuteAffrows(); - //} + if (updatePurchaserList.Count() > 0) + { + foreach (var update in updatePurchaserList) + update.ExecuteAffrows(); + } }); //#region 更新采购方案最新价格 diff --git a/BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs index 60b0119..ccbf601 100644 --- a/BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs @@ -4,7 +4,6 @@ using BBWYB.Common.Models; using BBWYB.Server.Model; using BBWYB.Server.Model.Db; using BBWYB.Server.Model.Db.BBWY; -using BBWYB.Server.Model.Db.SkuOptimization; using BBWYB.Server.Model.Dto; using FreeSql; using Newtonsoft.Json; diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs index fb6521f..7035c9d 100644 --- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs @@ -2,7 +2,6 @@ using BBWYB.Common.Models; using BBWYB.Server.Model; using BBWYB.Server.Model.Db; -using BBWYB.Server.Model.Db.SkuOptimization; using BBWYB.Server.Model.Dto; using FreeSql; using Newtonsoft.Json.Linq; @@ -146,7 +145,6 @@ namespace BBWYB.Server.Business.Sync List insertSkuOptimizationTaskList = new List(); List insertSkuOptimizationChildTaskList = new List(); - List insertCompetitiveTenderList = new List(); #endregion //等待检查sku销量的订单集合 @@ -467,58 +465,58 @@ namespace BBWYB.Server.Business.Sync // insertSkuOptimizationTaskList.Add(skuOptimizationTask); // #endregion - // #region 创建待优化子任务 - // { - // foreach (var department in bargainTeamList) - // { - // var skuOptimizationChildTask = new SkuOptimizationChildTask() - // { - // Id = idGenerator.NewLong(), - // BelongTeamId = department.Id, - // BelongTeamName = department.DepartmentName, - // CompletionTime = null, - // IsOptimizationCompleted = false, - // OptimizationTaskId = skuOptimizationTask.Id - // }; - // insertSkuOptimizationChildTaskList.Add(skuOptimizationChildTask); - - // #region 创建竞标任务 - // var schemeList = waitToCompetitiveTenderSchemeList.Where(ps => ps.SkuId == waitCheckOrderSku.SkuId && - // ps.BelongBargainTeamId == department.Id) - // .ToList(); - - // #endregion - // } - // } - // #endregion + #region 创建待优化子任务 + { + foreach (var department in bargainTeamList) + { + var skuOptimizationChildTask = new SkuOptimizationChildTask() + { + Id = idGenerator.NewLong(), + BelongTeamId = department.Id, + BelongTeamName = department.DepartmentName, + CompletionTime = null, + IsOptimizationCompleted = false, + OptimizationTaskId = skuOptimizationTask.Id + }; + insertSkuOptimizationChildTaskList.Add(skuOptimizationChildTask); + + #region 创建竞标任务 + var schemeList = waitToCompetitiveTenderSchemeList.Where(ps => ps.SkuId == waitCheckOrderSku.SkuId && + ps.BelongBargainTeamId == department.Id) + .ToList(); + + #endregion + } + } + #endregion // #region 创建待优化限时任务 // //判断sku是否首次采购 // var isFirst = !dbSkuTotalSaleInfoList.Any(s => s.SkuId == waitCheckOrderSku.SkuId); - // insertTimeLimitTaskList.Add(new TimeLimitTask() - // { - // Id = idGenerator.NewLong(), - // CreateTme = DateTime.Now, - // //ExpirationTime = DateTime.Now.AddDays(isFirst ? 2 : 1), - // ExpirationTime = timeLimitRules.CalculateExpirationTime(Enums.TimeLimitTaskType.待议价任务, DateTime.Now.AddDays(isFirst ? 1 : 0)), - // //OrderId = o.OrderId, - // //OrderSn = o.OrderSn, - // ShopId = shopId, - // SkuId = waitCheckOrderSku.SkuId, - // TaskType = Enums.TimeLimitTaskType.待议价任务, - // TaskId = skuOptimizationTask.Id, - // Remark = "首次采购限时任务" - // }); - // #endregion - // } - // } - // } - // } - // } - //} - //#endregion + insertTimeLimitTaskList.Add(new TimeLimitTask() + { + Id = idGenerator.NewLong(), + CreateTme = DateTime.Now, + //ExpirationTime = DateTime.Now.AddDays(isFirst ? 2 : 1), + ExpirationTime = timeLimitRules.CalculateExpirationTime(Enums.TimeLimitTaskType.待议价任务, DateTime.Now.AddDays(isFirst ? 1 : 0)), + //OrderId = o.OrderId, + //OrderSn = o.OrderSn, + ShopId = shopId, + SkuId = waitCheckOrderSku.SkuId, + TaskType = Enums.TimeLimitTaskType.待议价任务, + TaskId = skuOptimizationTask.Id, + Remark = "首次采购限时任务" + }); + #endregion + } + } + } + } + } + } + #endregion #region 检查限时采购任务 CheckPurchaseTimeLimitTask(shopId, qtOrderList.Items, dbPurchaseTimeLimitTaskList, insertTimeLimitTaskList); @@ -544,8 +542,8 @@ namespace BBWYB.Server.Business.Sync //if (insertSkuOptimizationChildTaskList.Count() > 0) // fsql.Insert(insertSkuOptimizationChildTaskList).ExecuteAffrows(); - //if (insertCompetitiveTenderList.Count() > 0) - // fsql.Insert(insertCompetitiveTenderList).ExecuteAffrows(); + if (insertCompetitiveTenderList.Count() > 0) + fsql.Insert(insertCompetitiveTenderList).ExecuteAffrows(); if (updateOrderList.Count() > 0) foreach (var update in updateOrderList) diff --git a/BBWYB.Server.Model/Db/SkuOptimization/Skuoptimizationchildtask.cs b/BBWYB.Server.Model/Db/Product/Skuoptimizationchildtask.cs similarity index 100% rename from BBWYB.Server.Model/Db/SkuOptimization/Skuoptimizationchildtask.cs rename to BBWYB.Server.Model/Db/Product/Skuoptimizationchildtask.cs diff --git a/BBWYB.Server.Model/Db/SkuOptimization/Skuoptimizationhistory.cs b/BBWYB.Server.Model/Db/Product/Skuoptimizationhistory.cs similarity index 100% rename from BBWYB.Server.Model/Db/SkuOptimization/Skuoptimizationhistory.cs rename to BBWYB.Server.Model/Db/Product/Skuoptimizationhistory.cs diff --git a/BBWYB.Server.Model/Db/SkuOptimization/Skuoptimizationtask.cs b/BBWYB.Server.Model/Db/Product/Skuoptimizationtask.cs similarity index 100% rename from BBWYB.Server.Model/Db/SkuOptimization/Skuoptimizationtask.cs rename to BBWYB.Server.Model/Db/Product/Skuoptimizationtask.cs diff --git a/BBWYB.Server.Model/Db/SkuOptimization/SkuOptimizationCompetitiveTenderTask.cs b/BBWYB.Server.Model/Db/SkuOptimization/SkuOptimizationCompetitiveTenderTask.cs deleted file mode 100644 index ca9b2fe..0000000 --- a/BBWYB.Server.Model/Db/SkuOptimization/SkuOptimizationCompetitiveTenderTask.cs +++ /dev/null @@ -1,66 +0,0 @@ -using FreeSql.DataAnnotations; - -namespace BBWYB.Server.Model.Db -{ - - /// - /// 采购方案竞标表 - /// - [Table(Name = "skuoptimizationcompetitivetendertask", DisableSyncStructure = true)] - public partial class SkuOptimizationCompetitiveTenderTask - { - [Column(DbType = "bigint", IsPrimary = true)] - public long Id { get; set; } - - [Column(DbType = "bigint")] - public long? ChildTaskId { get; set; } - - [Column(DbType = "datetime")] - public DateTime? CreateTime { get; set; } - - /// - /// 是否更新报价 - /// - public bool? IsUpdateQuotedPrice { get; set; } - - /// - /// 更新后的运费 - /// - public decimal? NewFreight { get; set; } - - /// - /// 更新后的报价 - /// - public decimal? NewQuotedPrice { get; set; } - - /// - /// 未更新的运费 - /// - public decimal? OldFreight { get; set; } - - /// - /// 未更新的报价 - /// - public decimal? OldQuotedPrice { get; set; } - - [Column(DbType = "bigint")] - public long? SchemeId { get; set; } - - [Column(DbType = "bigint")] - public long? TaskId { get; set; } - - [Column(StringLength = 50)] - public string SkuId { get; set; } - - [Column(DbType = "bigint")] - public long? TeamId { get; set; } - - /// - /// 更新时间 - /// - [Column(DbType = "datetime")] - public DateTime? UpdateTime { get; set; } - - } - -} diff --git a/BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationChildTaskResponse.cs b/BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationChildTaskResponse.cs index 70997a5..fb19868 100644 --- a/BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationChildTaskResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationChildTaskResponse.cs @@ -1,4 +1,4 @@ -using BBWYB.Server.Model.Db.SkuOptimization; +using BBWYB.Server.Model.Db; namespace BBWYB.Server.Model.Dto { diff --git a/BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationTaskResponse.cs b/BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationTaskResponse.cs index 00ee0b7..830fdd9 100644 --- a/BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationTaskResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationTaskResponse.cs @@ -1,5 +1,4 @@ using BBWYB.Server.Model.Db; -using BBWYB.Server.Model.Db.SkuOptimization; namespace BBWYB.Server.Model.Dto { diff --git a/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs b/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs index 95a15c0..b32d4bc 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.SkuOptimization; +using BBWYB.Server.Model.Db; namespace BBWYB.Server.Model.Dto { diff --git a/BBWYB.Server.Model/MappingProfiles.cs b/BBWYB.Server.Model/MappingProfiles.cs index 8f323a9..94fd5a2 100644 --- a/BBWYB.Server.Model/MappingProfiles.cs +++ b/BBWYB.Server.Model/MappingProfiles.cs @@ -1,6 +1,5 @@ using AutoMapper; using BBWYB.Server.Model.Db; -using BBWYB.Server.Model.Db.SkuOptimization; using BBWYB.Server.Model.Dto; namespace BBWYB.Server.Model