spu任务增加剩余时间，spu所有配件接口增加归属

BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs

@@ -1024,7 +1024,7 @@ namespace BBWYB.Server.Business
             return purchaseSchemeList;
         }
 
-        public IList<PurchaseSchemeProductSkuResponse> GetMergePurchaseSchemeProductSkuByProductId(string productId, string userId)
+        public IList<MergePurchaseSchemeProductSkuResponse> 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<string>() { productId },
                 BargainTeamIdList = user.isBargainTeam ? new List<string>() { user.user.DepartmentId } : null
             });
-            var mergePssList = new List<PurchaseSchemeProductSkuResponse>();
+            var mergePssList = new List<MergePurchaseSchemeProductSkuResponse>();
             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<MergePurchaseSchemeProductSkuResponse>();
+                            mergePssList.Add(mergePss);
+                        }
+                        mergePss.BelongSkuIdList.Add(pss.SkuId);
                     }
                 }
             }

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();