From e12d99b933ffb904d0ce3eb3b6f244d4ff3d090c Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 26 Sep 2023 02:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Esku=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.Business/Order/OrderBusiness.cs  | 19 ++++++++++++++++++-
 .../Dto/Response/Order/OrderSkuResponse.cs    |  5 +++++
 .../Product/SkuOptimizationHistoryResponse.cs |  8 ++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs

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<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()
             {
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
         /// 待议价任务
         /// </summary>
         public TimeLimitTaskResponse OptimizationTimeLimitTask { get; set; }
+
+        /// <summary>
+        /// SKU优化历史列表
+        /// </summary>
+        public IList<SkuOptimizationHistoryResponse> 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
+    {
+    }
+}