Browse Source

合并冲突

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

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

@ -465,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 创建待优化子任务
// {
// 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();
// #region 创建竞标任务
// var schemeList = waitToCompetitiveTenderSchemeList.Where(ps => ps.SkuId == waitCheckOrderSku.SkuId &&
// ps.BelongBargainTeamId == department.Id)
// .ToList();
#endregion
}
}
#endregion
// #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);
@ -542,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)

Loading…
Cancel
Save