Browse Source

合并冲突

liangku_skuoptimazation
shanji 1 year ago
parent
commit
080d907970
  1. 96
      BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

96
BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@ -465,58 +465,58 @@ namespace BBWYB.Server.Business.Sync
// insertSkuOptimizationTaskList.Add(skuOptimizationTask); // insertSkuOptimizationTaskList.Add(skuOptimizationTask);
// #endregion // #endregion
#region 创建待优化子任务 // #region 创建待优化子任务
{ // {
foreach (var department in bargainTeamList) // foreach (var department in bargainTeamList)
{ // {
var skuOptimizationChildTask = new SkuOptimizationChildTask() // var skuOptimizationChildTask = new SkuOptimizationChildTask()
{ // {
Id = idGenerator.NewLong(), // Id = idGenerator.NewLong(),
BelongTeamId = department.Id, // BelongTeamId = department.Id,
BelongTeamName = department.DepartmentName, // BelongTeamName = department.DepartmentName,
CompletionTime = null, // CompletionTime = null,
IsOptimizationCompleted = false, // IsOptimizationCompleted = false,
OptimizationTaskId = skuOptimizationTask.Id // OptimizationTaskId = skuOptimizationTask.Id
}; // };
insertSkuOptimizationChildTaskList.Add(skuOptimizationChildTask); // insertSkuOptimizationChildTaskList.Add(skuOptimizationChildTask);
#region 创建竞标任务 // #region 创建竞标任务
var schemeList = waitToCompetitiveTenderSchemeList.Where(ps => ps.SkuId == waitCheckOrderSku.SkuId && // var schemeList = waitToCompetitiveTenderSchemeList.Where(ps => ps.SkuId == waitCheckOrderSku.SkuId &&
ps.BelongBargainTeamId == department.Id) // ps.BelongBargainTeamId == department.Id)
.ToList(); // .ToList();
#endregion // #endregion
} // }
} // }
#endregion // #endregion
// #region 创建待优化限时任务 // #region 创建待优化限时任务
// //判断sku是否首次采购 // //判断sku是否首次采购
// var isFirst = !dbSkuTotalSaleInfoList.Any(s => s.SkuId == waitCheckOrderSku.SkuId); // var isFirst = !dbSkuTotalSaleInfoList.Any(s => s.SkuId == waitCheckOrderSku.SkuId);
insertTimeLimitTaskList.Add(new TimeLimitTask() // insertTimeLimitTaskList.Add(new TimeLimitTask()
{ // {
Id = idGenerator.NewLong(), // Id = idGenerator.NewLong(),
CreateTme = DateTime.Now, // CreateTme = DateTime.Now,
//ExpirationTime = DateTime.Now.AddDays(isFirst ? 2 : 1), // //ExpirationTime = DateTime.Now.AddDays(isFirst ? 2 : 1),
ExpirationTime = timeLimitRules.CalculateExpirationTime(Enums.TimeLimitTaskType., DateTime.Now.AddDays(isFirst ? 1 : 0)), // ExpirationTime = timeLimitRules.CalculateExpirationTime(Enums.TimeLimitTaskType.待议价任务, DateTime.Now.AddDays(isFirst ? 1 : 0)),
//OrderId = o.OrderId, // //OrderId = o.OrderId,
//OrderSn = o.OrderSn, // //OrderSn = o.OrderSn,
ShopId = shopId, // ShopId = shopId,
SkuId = waitCheckOrderSku.SkuId, // SkuId = waitCheckOrderSku.SkuId,
TaskType = Enums.TimeLimitTaskType., // TaskType = Enums.TimeLimitTaskType.待议价任务,
TaskId = skuOptimizationTask.Id, // TaskId = skuOptimizationTask.Id,
Remark = "首次采购限时任务" // Remark = "首次采购限时任务"
}); // });
#endregion // #endregion
} // }
} // }
} // }
} // }
} // }
} //}
#endregion //#endregion
#region 检查限时采购任务 #region 检查限时采购任务
CheckPurchaseTimeLimitTask(shopId, qtOrderList.Items, dbPurchaseTimeLimitTaskList, insertTimeLimitTaskList); CheckPurchaseTimeLimitTask(shopId, qtOrderList.Items, dbPurchaseTimeLimitTaskList, insertTimeLimitTaskList);
@ -542,8 +542,8 @@ namespace BBWYB.Server.Business.Sync
//if (insertSkuOptimizationChildTaskList.Count() > 0) //if (insertSkuOptimizationChildTaskList.Count() > 0)
// fsql.Insert(insertSkuOptimizationChildTaskList).ExecuteAffrows(); // fsql.Insert(insertSkuOptimizationChildTaskList).ExecuteAffrows();
if (insertCompetitiveTenderList.Count() > 0) //if (insertCompetitiveTenderList.Count() > 0)
fsql.Insert(insertCompetitiveTenderList).ExecuteAffrows(); // fsql.Insert(insertCompetitiveTenderList).ExecuteAffrows();
if (updateOrderList.Count() > 0) if (updateOrderList.Count() > 0)
foreach (var update in updateOrderList) foreach (var update in updateOrderList)

Loading…
Cancel
Save