新增sku优化历史

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -227,6 +227,7 @@ namespace BBWYB.Server.Business
             var orderList = orderSourceList.Map<IList<OrderResponse>>();
             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<SkuOptimizationHistory>()
+                                                         .Where(x => x.ShopId == request.ShopId && orderSkuIdList.Contains(x.SkuId))
+                                                         .OrderByDescending(x => x.CreateTime)
+                                                         .ToList<SkuOptimizationHistoryResponse>();
+                    if (skuOptimizationHistoryList.Count() > 0)
+                    {
+                        foreach (var orderSku in orderSkuList)
+                        {
+                            orderSku.OptimizationHistoryList = skuOptimizationHistoryList.Where(x => x.SkuId == orderSku.SkuId).ToList();
+                        }
+                    }
+                }
+                #endregion
             }
             return new OrderListResponse()
             {

BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs

@@ -44,5 +44,10 @@ namespace BBWYB.Server.Model.Dto
         /// 待议价任务
         /// </summary>
         public TimeLimitTaskResponse OptimizationTimeLimitTask { get; set; }
+
+        /// <summary>
+        /// SKU优化历史列表
+        /// </summary>
+        public IList<SkuOptimizationHistoryResponse> OptimizationHistoryList { get; set; }
     }
 }

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
+    {
+    }
+}