From ac16bcc70a291cf9b6cfe4473d913ebcf423dc86 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 21 Apr 2023 00:43:56 +0800
Subject: [PATCH] 1

---
 .../Models/APIModel/Response/Order/OrderResponse.cs   |  5 +++++
 BBWYB.Client/ViewModels/Order/OrderViewModel.cs       | 11 ++++-------
 BBWYB.Client/Views/Order/OrderList.xaml               |  4 ++++
 BBWYB.Server.Business/Sync/OrderSyncBusiness.cs       |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
index 463c3bd..9e66e2b 100644
--- a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
+++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
@@ -122,6 +122,11 @@ namespace BBWYB.Client.Models
         /// </summary>
         public bool IsPurchased { get; set; }
 
+        /// <summary>
+        /// 买家账号
+        /// </summary>
+        public string BuyerAccount { get; set; }
+
         /// <summary>
         /// 收货人信息
         /// </summary>
diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
index a7af0b4..9c0c2d7 100644
--- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
@@ -113,15 +113,12 @@ namespace BBWYB.Client.ViewModels
             var list = response.Data.Items.Map<IList<Order>>();
             App.Current.Dispatcher.Invoke(() =>
             {
-                foreach (var o in list)
+                foreach (var order in list)
                 {
-                    foreach (var order in list)
-                    {
-                        order.LocalConvert();
-                        OrderList.Add(order);
-                    }
-                    WeakReferenceMessenger.Default.Send(new Message_OrderListScrollToTop(null));
+                    order.LocalConvert();
+                    OrderList.Add(order);
                 }
+                WeakReferenceMessenger.Default.Send(new Message_OrderListScrollToTop(null));
             });
         }
 
diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index afcf1d2..a6e6e74 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -369,6 +369,10 @@
                                                CommandParameter="{Binding Id}" Margin="5,0,0,0"/>
                                         <c:BButton x:Name="btn_orderState" Content="{Binding OrderState}" Margin="5,0,0,0" Height="25" Padding="5,0" Background="{StaticResource Text.Link.Color}"/>
                                         <Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/>
+                                        <TextBlock VerticalAlignment="Center" Margin="5,0,0,0" Text="下单账号:"/>
+                                        <c:BButton Style="{StaticResource LinkButton}" Content="{Binding BuyerAccount}" Margin="5,0,0,0"
+                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                                   CommandParameter="{Binding BuyerAccount}"/>
                                         <TextBlock VerticalAlignment="Center" Margin="5,0,0,0" Text="下单店铺:"/>
                                         <c:BButton Style="{StaticResource LinkButton}" Content="{Binding SourceShopName}" Margin="5,0,0,0"
                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
index 4ffca38..3a6a3d0 100644
--- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
@@ -188,7 +188,7 @@ namespace BBWYB.Server.Business.Sync
                         if (dbOrder.BuyerAccount != qtOrder.UserAccount)
                             updateBuyerAccount = true;
 
-                        if (updateOrderState || updateWaybillNo || updateModifyTime || updateBuyerRemark || updateVenderRemark)
+                        if (updateOrderState || updateWaybillNo || updateModifyTime || updateBuyerRemark || updateVenderRemark || updateBuyerAccount)
                         {
                             var update = fsql.Update<Model.Db.Order>(dbOrder.Id).SetIf(updateOrderState, o => o.OrderState == orderState)
                                                                                 .SetIf(updateWaybillNo, o => o.WaybillNo, qtOrder.DeliveryResponse.WayBillNo)