diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 7595e99..1d232e6 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -227,6 +227,7 @@ namespace BBWYB.Server.Business var orderList = orderSourceList.Map>(); var orderIdList = orderList.Select(o => o.Id).ToList(); + if (orderList.Count() > 0) { #region 查询关联信息 @@ -446,7 +447,23 @@ namespace BBWYB.Server.Business #endregion - + #region SKU优化历史 + if (request.IsNeedOptimization == 1 && request.OrderState == Enums.OrderState.等待采购) + { + var orderSkuIdList = orderSkuList.Select(osku => osku.SkuId).Distinct().ToList(); + var skuOptimizationHistoryList = fsql.Select() + .Where(x => x.ShopId == request.ShopId && orderSkuIdList.Contains(x.SkuId)) + .OrderByDescending(x => x.CreateTime) + .ToList(); + if (skuOptimizationHistoryList.Count() > 0) + { + foreach (var orderSku in orderSkuList) + { + orderSku.OptimizationHistoryList = skuOptimizationHistoryList.Where(x => x.SkuId == orderSku.SkuId).ToList(); + } + } + } + #endregion } return new OrderListResponse() { diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs index 43284ff..e5f69a4 100644 --- a/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs @@ -44,5 +44,10 @@ namespace BBWYB.Server.Model.Dto /// 待议价任务 /// public TimeLimitTaskResponse OptimizationTimeLimitTask { get; set; } + + /// + /// SKU优化历史列表 + /// + public IList OptimizationHistoryList { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs b/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs new file mode 100644 index 0000000..b32d4bc --- /dev/null +++ b/BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs @@ -0,0 +1,8 @@ +using BBWYB.Server.Model.Db; + +namespace BBWYB.Server.Model.Dto +{ + public class SkuOptimizationHistoryResponse: SkuOptimizationHistory + { + } +}