|
|
@ -171,6 +171,7 @@ namespace BBWYB.Server.Business |
|
|
var spuOptimizationTask = new SpuOptimizationTask() |
|
|
var spuOptimizationTask = new SpuOptimizationTask() |
|
|
{ |
|
|
{ |
|
|
Id = idGenerator.NewLong(), |
|
|
Id = idGenerator.NewLong(), |
|
|
|
|
|
BelongShopId = long.Parse(belongShop.ShopId), |
|
|
BelongShopName = belongShop.ShopName, |
|
|
BelongShopName = belongShop.ShopName, |
|
|
CompletionTime = null, |
|
|
CompletionTime = null, |
|
|
CreateTime = DateTime.Now, |
|
|
CreateTime = DateTime.Now, |
|
|
@ -507,61 +508,46 @@ namespace BBWYB.Server.Business |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public ListResponse<SkuOptimizationTaskResponse> GetNoCompletionSkuOptimizationTask(QueryNoCompletionOptimizationTaskRequest request, string userId) |
|
|
public ListResponse<SpuOptimizationTaskResponse> GetNoCompletionSkuOptimizationTask(QueryNoCompletionOptimizationTaskRequest request, string userId) |
|
|
{ |
|
|
{ |
|
|
|
|
|
request.EndTime = request.EndTime.Date; |
|
|
var uInfo = userBusiness.GetisBargainTeamByUserId(userId, true); |
|
|
var uInfo = userBusiness.GetisBargainTeamByUserId(userId, true); |
|
|
var taskList = fsql.Select<SkuOptimizationTask, TimeLimitTask>() |
|
|
var taskList = fsql.Select<SpuOptimizationTask>() |
|
|
.InnerJoin((t, tt) => t.Id == tt.TaskId) |
|
|
.Where(t => t.IsOptimizationCompleted == false && |
|
|
.Where((t, tt) => t.IsOptimizationCompleted == false) |
|
|
t.CreateTime >= request.StartTime && |
|
|
.OrderByDescending((t, tt) => t.CreateTime) |
|
|
t.CreateTime <= request.EndTime) |
|
|
|
|
|
.WhereIf(request.BelongShopId != null && request.BelongShopId != 0, t => t.BelongShopId == request.BelongShopId) |
|
|
|
|
|
.WhereIf(!string.IsNullOrEmpty(request.JDSku), t => fsql.Select<SkuOptimizationTask>() |
|
|
|
|
|
.Where(st => st.SpuOptimizationTaskId == t.Id && |
|
|
|
|
|
st.JDSkuId == request.JDSku) |
|
|
|
|
|
.Any()) |
|
|
|
|
|
.OrderByDescending(t => t.CreateTime) |
|
|
.Count(out var total) |
|
|
.Count(out var total) |
|
|
.Page(request.PageIndex, request.PageSize) |
|
|
.Page(request.PageIndex, request.PageSize) |
|
|
.ToList((t, tt) => new SkuOptimizationTask |
|
|
.ToList<SpuOptimizationTaskResponse>(); |
|
|
{ |
|
|
|
|
|
Id = t.Id, |
|
|
var spuTaskIdList = taskList.Select(t => t.Id).ToList(); |
|
|
ShopId = t.ShopId, |
|
|
|
|
|
BelongShopName = t.BelongShopName, |
|
|
#region 获取议价组任务
|
|
|
JDSkuId = t.JDSkuId, |
|
|
var bargainTeamTaskList = fsql.Select<SpuOptimizationBargainTeamTask>() |
|
|
ProductId = t.ProductId, |
|
|
.Where(sbt => spuTaskIdList.Contains(sbt.SpuOptimizationTaskId)) |
|
|
SkuId = t.SkuId, |
|
|
.ToList<SpuOptimizationBargainTeamTaskResponse>(); |
|
|
PreItemCount = t.PreItemCount, |
|
|
#endregion
|
|
|
PrePurchasedAmount = t.PrePurchasedAmount, |
|
|
|
|
|
SafeWarningRemainingDay = t.SafeWarningRemainingDay, |
|
|
#region 限时任务
|
|
|
IsOptimizationCompleted = t.IsOptimizationCompleted, |
|
|
var timelimitTaskList = fsql.Select<TimeLimitTask>() |
|
|
IsPurchasementCompleted = t.IsPurchasementCompleted, |
|
|
.Where(t => t.TaskType == Enums.TimeLimitTaskType.待议价任务 && spuTaskIdList.Contains(t.TaskId)) |
|
|
CreateTime = t.CreateTime, |
|
|
.ToList<TimeLimitTaskResponse>(); |
|
|
CompletionTime = t.CompletionTime, |
|
|
#endregion
|
|
|
TriggerOptimizationReason = t.TriggerOptimizationReason, |
|
|
|
|
|
LastOptimizationRatio = t.LastOptimizationRatio, |
|
|
|
|
|
LastPurchasePrice = t.LastPurchasePrice, |
|
|
|
|
|
LastOptimizationTime = t.LastOptimizationTime, |
|
|
|
|
|
|
|
|
|
|
|
TimeLimitTaskId = tt.Id, |
|
|
|
|
|
TimeLimitTaskBelongTaskId = tt.TaskId, |
|
|
|
|
|
TimeLimitTaskCompletionTime = tt.CompletionTime, |
|
|
|
|
|
TimeLimitTaskCreateTme = tt.CreateTme, |
|
|
|
|
|
TimeLimitTaskExpirationTime = tt.ExpirationTime, |
|
|
|
|
|
TimeLimitTaskIsTimely = tt.IsTimely, |
|
|
|
|
|
TimeLimitTaskOrderId = tt.OrderId, |
|
|
|
|
|
TimeLimitTaskOrderSn = tt.OrderSn, |
|
|
|
|
|
TimeLimitTaskPayTime = tt.PayTime, |
|
|
|
|
|
TimeLimitTaskRemark = tt.Remark, |
|
|
|
|
|
TimeLimitTaskShopId = tt.ShopId, |
|
|
|
|
|
TimeLimitTaskSkuId = tt.SkuId, |
|
|
|
|
|
TimeLimitTaskTaskType = tt.TaskType |
|
|
|
|
|
}).Map<List<SkuOptimizationTaskResponse>>(); |
|
|
|
|
|
|
|
|
|
|
|
List<long> taskIdList = taskList.Select(t => t.Id).ToList(); |
|
|
|
|
|
var childTaskList = fsql.Select<SkuOptimizationChildTask>().Where(ct => taskIdList.Contains(ct.OptimizationTaskId)).ToList<SkuOptimizationChildTaskResponse>(); |
|
|
|
|
|
|
|
|
|
|
|
foreach (var task in taskList) |
|
|
foreach (var task in taskList) |
|
|
{ |
|
|
{ |
|
|
task.ChildTaskList = childTaskList.Where(ct => ct.OptimizationTaskId == task.Id).ToList(); |
|
|
task.BargainTeamTaskList = bargainTeamTaskList.Where(sbt => sbt.SpuOptimizationTaskId == task.Id).ToList(); |
|
|
var currentChildTask = task.ChildTaskList.FirstOrDefault(ct => ct.BelongTeamId == uInfo.user.DepartmentId); |
|
|
task.TimeLimitTask = timelimitTaskList.FirstOrDefault(t => t.TaskId == task.Id); |
|
|
task.IsOptimizationCompletedByCurrentTeam = currentChildTask?.IsOptimizationCompleted ?? false; |
|
|
task.IsCompletedByCurrentTeam = task.BargainTeamTaskList.FirstOrDefault(sbt => sbt.BelongTeamId == uInfo.department.Id)?.IsOptimizationCompleted == true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return new ListResponse<SkuOptimizationTaskResponse>() |
|
|
return new ListResponse<SpuOptimizationTaskResponse>() |
|
|
{ |
|
|
{ |
|
|
Items = taskList, |
|
|
Items = taskList, |
|
|
TotalCount = total |
|
|
TotalCount = total |
|
|
|
