From 83287f600dcb552313dfc132dfb03f7ccdd25bdc Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 12 Jul 2022 23:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9EAfterSaleOrderList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Views/Order/OrderList.xaml      | 2 +-
 BBWY.Server.Business/Order/OrderBusiness.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 20033f03..deee12a4 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -754,7 +754,7 @@
 
                                 <ListBox x:Name="listbox_afterSaleOrder" Grid.Column="5"
                                          Visibility="Collapsed">
-
+                                        
                                 </ListBox>
 
                                 <TextBlock Text="{Binding OrderState}" Grid.Column="6"
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index b34a992f..802031cd 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -341,6 +341,7 @@ namespace BBWY.Server.Business
                                                                            SDOperator = o.SDOperator,
                                                                            SDPayBillNo = o.SDPayBillNo,
                                                                            SDPayChannel = o.SDPayChannel,
+                                                                           IsAfterSaleOrder = o.IsAfterSaleOrder,
 
                                                                            ContactName = ocs.ContactName,
                                                                            Address = ocs.Address,
@@ -374,6 +375,9 @@ namespace BBWY.Server.Business
             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).ToList().Map<IList<OrderDropShippingResponse>>();
 
+            if (order.IsAfterSaleOrder)
+                orderResponse.AfterSaleOrderList = fsql.Select<AfterSaleOrder>().Where(aso => aso.OrderId == orderId).ToList<AfterSaleOrderResponse>();
+
             orderResponse.OrderDropShippingList = orderDropShippingList;
             orderResponse.ItemList = orderSkuList;
             if (order.StorageType == Enums.StorageType.代发)