From dd1ef3854980de55a9297d4cd8a47d596c2407fc Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Thu, 21 Mar 2024 22:49:57 +0800 Subject: [PATCH] =?UTF-8?q?spu=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=89=A9=E4=BD=99=E6=97=B6=E9=97=B4=EF=BC=8Cspu=E6=89=80?= =?UTF-8?q?=E6=9C=89=E9=85=8D=E4=BB=B6=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BD=92=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseScheme/PurchaseSchemeBusiness.cs | 13 +++++++++---- .../SkuOptimization/OptimizationBusiness.cs | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 4b458de..c5f2213 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -1024,7 +1024,7 @@ namespace BBWYB.Server.Business return purchaseSchemeList; } - public IList GetMergePurchaseSchemeProductSkuByProductId(string productId, string userId) + public IList GetMergePurchaseSchemeProductSkuByProductId(string productId, string userId) { var user = userBusiness.GetisBargainTeamByUserId(userId); var purchaseSchemeList = GetPurchaseSchemeList(new QuerySchemeRequest() @@ -1032,15 +1032,20 @@ namespace BBWYB.Server.Business ProductIdList = new List() { productId }, BargainTeamIdList = user.isBargainTeam ? new List() { user.user.DepartmentId } : null }); - var mergePssList = new List(); + var mergePssList = new List(); foreach (var scheme in purchaseSchemeList) { foreach (var psp in scheme.PurchaseSchemeProductList) { foreach (var pss in psp.PurchaseSchemeProductSkuList) { - if (!mergePssList.Any(x => x.PurchaseSkuId == pss.PurchaseSkuId)) - mergePssList.Add(pss); + var mergePss = mergePssList.FirstOrDefault(x => x.PurchaseSkuId == pss.PurchaseSkuId); + if (mergePss == null) + { + mergePss = pss.Map(); + mergePssList.Add(mergePss); + } + mergePss.BelongSkuIdList.Add(pss.SkuId); } } } diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs index 29ee702..03718f8 100644 --- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs @@ -642,7 +642,7 @@ namespace BBWYB.Server.Business task.BargainTeamTaskList = bargainTeamTaskList.Where(sbt => sbt.SpuOptimizationTaskId == task.Id).ToList(); task.TimeLimitTask = timelimitTaskList.FirstOrDefault(t => t.TaskId == task.Id); if (task.TimeLimitTask != null) - timeLimitRules.CalculateLessTimeForWorkHour(task.TimeLimitTask.ExpirationTime.Value); + task.TimeLimitTask.RemainingTime = timeLimitRules.CalculateLessTimeForWorkHour(task.TimeLimitTask.ExpirationTime.Value); task.IsCompletedByCurrentTeam = task.BargainTeamTaskList.FirstOrDefault(sbt => sbt.BelongTeamId == uInfo.department.Id)?.IsOptimizationCompleted == true; task.SkuOptimizationTaskList = skuTaskList.Where(st => st.SpuOptimizationTaskId == task.Id).ToList();