diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 6afaf58..13dd1cd 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -450,7 +450,7 @@ namespace BBWYB.Server.Business #region SKU优化历史 if (request.IsNeedOptimization == 1 && request.OrderState == Enums.OrderState.等待采购) { - var orderSkuIdList = orderSkuList.Select(osku => osku.SkuId).Distinct().ToList(); + var orderSkuIdList = orderSkuList.Where(osku => osku.IsNeedOptimization == 1).Select(osku => osku.SkuId).Distinct().ToList(); var skuOptimizationHistoryList = fsql.Select() .Where(x => x.ShopId == request.ShopId && orderSkuIdList.Contains(x.SkuId)) .OrderByDescending(x => x.CreateTime) @@ -462,6 +462,18 @@ namespace BBWYB.Server.Business orderSku.OptimizationHistoryList = skuOptimizationHistoryList.Where(x => x.SkuId == orderSku.SkuId).ToList(); } } + + foreach (var order in orderList) + { + for (var i = 0; i < order.ItemList.Count(); i++) + { + if (order.ItemList[i].IsNeedOptimization != 1) + { + order.ItemList.RemoveAt(i); + i--; + } + } + } } #endregion }