1

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>

BBWYB.Client/ViewModels/Order/OrderViewModel.cs

@@ -112,8 +112,6 @@ 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)
                 {
@@ -121,7 +119,6 @@ namespace BBWYB.Client.ViewModels
                     OrderList.Add(order);
                 }
                 WeakReferenceMessenger.Default.Send(new Message_OrderListScrollToTop(null));
-                }
             });
         }
 

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}}}"

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)