|
|
@ -804,7 +804,7 @@ namespace BBWY.Server.Business |
|
|
//开始下一轮开始任务
|
|
|
//开始下一轮开始任务
|
|
|
var nextPromotionTaskList = fsql.Select<PromotionTask>().WhereIf(shopId != null, pt => pt.ShopId == shopId) |
|
|
var nextPromotionTaskList = fsql.Select<PromotionTask>().WhereIf(shopId != null, pt => pt.ShopId == shopId) |
|
|
.Where(pt => pt.Status == Enums.PromitionTaskStatus.等待 && pt.PreTaskId == -1) |
|
|
.Where(pt => pt.Status == Enums.PromitionTaskStatus.等待 && pt.PreTaskId == -1) |
|
|
.ToList(pt => new { Id = pt.Id, ShopId = pt.ShopId }); |
|
|
.ToList(pt => new { Id = pt.Id, ShopId = pt.ShopId, TaskName = pt.ActivityName }); |
|
|
if (nextPromotionTaskList.Count() > 0) |
|
|
if (nextPromotionTaskList.Count() > 0) |
|
|
{ |
|
|
{ |
|
|
foreach (var nextTask in nextPromotionTaskList) |
|
|
foreach (var nextTask in nextPromotionTaskList) |
|
|
@ -812,7 +812,7 @@ namespace BBWY.Server.Business |
|
|
var shop = shopList.FirstOrDefault(s => s.ShopId == nextTask.ShopId.ToString()); |
|
|
var shop = shopList.FirstOrDefault(s => s.ShopId == nextTask.ShopId.ToString()); |
|
|
if (shop != null) |
|
|
if (shop != null) |
|
|
{ |
|
|
{ |
|
|
Task.Factory.StartNew(() => AutoStart(nextTask.Id, shop), CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.JDPromotionAutoStartTaskScheduler); |
|
|
Task.Factory.StartNew(() => AutoStart(nextTask.Id, nextTask.TaskName, shop), CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.JDPromotionAutoStartTaskScheduler); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -1035,19 +1035,20 @@ namespace BBWY.Server.Business |
|
|
{ |
|
|
{ |
|
|
var childTaskList = fsql.Select<PromotionTask>().Where(pt => pt.ShopId == shopId && |
|
|
var childTaskList = fsql.Select<PromotionTask>().Where(pt => pt.ShopId == shopId && |
|
|
pt.Status == Enums.PromitionTaskStatus.等待 && |
|
|
pt.Status == Enums.PromitionTaskStatus.等待 && |
|
|
jobDoneTaskIdList.Contains(pt.PreTaskId.Value)).ToList(pt => pt.Id); |
|
|
jobDoneTaskIdList.Contains(pt.PreTaskId.Value)) |
|
|
|
|
|
.ToList(pt => new { Id = pt.Id, ShopId = pt.ShopId, TaskName = pt.ActivityName }); |
|
|
if (childTaskList.Count() > 0) |
|
|
if (childTaskList.Count() > 0) |
|
|
{ |
|
|
{ |
|
|
foreach (var taskId in childTaskList) |
|
|
foreach (var task in childTaskList) |
|
|
{ |
|
|
{ |
|
|
Task.Factory.StartNew(() => AutoStart(taskId, shop), CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.JDPromotionAutoStartTaskScheduler); |
|
|
Task.Factory.StartNew(() => AutoStart(task.Id, task.TaskName, shop), CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.JDPromotionAutoStartTaskScheduler); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
#endregion
|
|
|
#endregion
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void AutoStart(long taskId, ShopResponse shop) |
|
|
private void AutoStart(long taskId, string taskName, ShopResponse shop) |
|
|
{ |
|
|
{ |
|
|
var loggerName = $"评价助手-{shop.ShopName}"; |
|
|
var loggerName = $"评价助手-{shop.ShopName}"; |
|
|
try |
|
|
try |
|
|
@ -1063,7 +1064,7 @@ namespace BBWY.Server.Business |
|
|
} |
|
|
} |
|
|
catch (Exception ex) |
|
|
catch (Exception ex) |
|
|
{ |
|
|
{ |
|
|
Error(shop, loggerName, $"AutoStart 任务Id {taskId}", ex); |
|
|
Error(shop, loggerName, $"AutoStart 任务[{taskName}]", ex); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
