From b681544c9ff4dac32459221036a6322d066f4aa6 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 7 Oct 2022 03:23:04 +0800
Subject: [PATCH] 1

---
 BBWY.Server.Business/Order/OrderBusiness.cs        | 14 ++++++++++----
 .../Dto/Response/Order/OrderResponse.cs            |  5 +++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index ec6c97a5..539cc8c4 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -174,11 +174,15 @@ namespace BBWY.Server.Business
                 var orderIdList = orderList.Select(o => o.Id).ToList();
 
                 #region 处理代发信息
-                var orderDropShippingList = fsql.Select<OrderDropShipping>().Where(ods => orderIdList.Contains(ods.OrderId) && ods.IsHistory == false)
+                var orderDropShippingList = fsql.Select<OrderDropShipping>().Where(ods => orderIdList.Contains(ods.OrderId))
                                                                             .ToList()
                                                                             .Map<IList<OrderDropShippingResponse>>();
                 foreach (var order in orderList)
-                    order.OrderDropShippingList = orderDropShippingList.Where(ods => ods.OrderId == order.Id).ToList();
+                {
+                    order.OrderDropShippingList = orderDropShippingList.Where(ods => ods.OrderId == order.Id && ods.IsHistory == false).ToList();
+                    order.HistoryOrderDropShippingList = orderDropShippingList.Where(ods => ods.OrderId == order.Id && ods.IsHistory).ToList();
+                }
+                  
                 #endregion
 
                 #region 处理Sku
@@ -329,12 +333,14 @@ namespace BBWY.Server.Business
             var orderSkuList = fsql.Select<OrderSku>().Where(osku => osku.OrderId == orderId).ToList().Map<IList<OrderSkuResponse>>();
             var orderCouponList = fsql.Select<OrderCoupon>().Where(oc => oc.OrderId == orderId).ToList().Map<IList<OrderCouponResponse>>();
             var orderCostDetailList = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == orderId && ocd.IsEnabled == true).ToList().Map<IList<OrderCostDetailResponse>>();
-            var orderDropShippingList = fsql.Select<OrderDropShipping>().Where(ods => ods.OrderId == orderId && ods.IsHistory == false).ToList().Map<IList<OrderDropShippingResponse>>();
+            var orderDropShippingList = fsql.Select<OrderDropShipping>().Where(ods => ods.OrderId == orderId).ToList().Map<IList<OrderDropShippingResponse>>();
 
             if (order.IsAfterSaleOrder)
                 orderResponse.AfterSaleOrderList = fsql.Select<AfterSaleOrder>().Where(aso => aso.OrderId == orderId).ToList<AfterSaleOrderResponse>();
 
-            orderResponse.OrderDropShippingList = orderDropShippingList;
+            //orderResponse.OrderDropShippingList = orderDropShippingList;
+            orderResponse.OrderDropShippingList = orderDropShippingList.Where(ods => ods.IsHistory == false).ToList();
+            orderResponse.HistoryOrderDropShippingList = orderDropShippingList.Where(ods => ods.IsHistory).ToList();
             orderResponse.ItemList = orderSkuList;
             if (order.StorageType == Enums.StorageType.代发)
             {
diff --git a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
index 7871095b..6cd6bf12 100644
--- a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
@@ -190,6 +190,11 @@ namespace BBWY.Server.Model.Dto
         /// </summary>
         public IList<OrderDropShippingResponse> OrderDropShippingList { get; set; }
 
+        /// <summary>
+        /// 历史代发信息
+        /// </summary>
+        public IList<OrderDropShippingResponse> HistoryOrderDropShippingList { get; set; }
+
         /// <summary>
         /// 售后信息
         /// </summary>