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

---
 BBWYB.Server.Business/Order/OrderBusiness.cs           | 1 +
 BBWYB.Server.Business/Sync/OrderSyncBusiness.cs        | 9 +++++++--
 BBWYB.Server.Model/Db/Order/Order.cs                   | 5 +++++
 BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs | 5 +++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 46ef520..642f713 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -85,6 +85,7 @@ namespace BBWYB.Server.Business
                 SourceSku = o.SourceSku,
                 ExpressName = o.ExpressName,
                 IsPurchased = o.IsPurchased,
+                BuyerAccount = o.BuyerAccount,
 
                 ContactName = ocs.ContactName,
                 Address = ocs.Address,
diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
index 7f00bed..4ffca38 100644
--- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
@@ -110,7 +110,8 @@ namespace BBWYB.Server.Business.Sync
                             VenderRemark = qtOrder.VenderRemark,
                             WaybillNo = qtOrder.DeliveryResponse.WayBillNo,
                             OrderState = orderState,
-                            ClientOrderId = qtOrder.ClientOrderId
+                            ClientOrderId = qtOrder.ClientOrderId,
+                            BuyerAccount = qtOrder.UserAccount
                         };
                         if (!string.IsNullOrEmpty(qtOrder.Extended))
                         {
@@ -170,6 +171,7 @@ namespace BBWYB.Server.Business.Sync
                         var updateModifyTime = false;
                         var updateBuyerRemark = false;
                         var updateVenderRemark = false;
+                        var updateBuyerAccount = false;
 
                         if (dbOrder.OrderState != orderState)
                             updateOrderState = true;
@@ -183,6 +185,8 @@ namespace BBWYB.Server.Business.Sync
                             updateBuyerRemark = true;
                         if (dbOrder.VenderRemark != qtOrder.VenderRemark)
                             updateVenderRemark = true;
+                        if (dbOrder.BuyerAccount != qtOrder.UserAccount)
+                            updateBuyerAccount = true;
 
                         if (updateOrderState || updateWaybillNo || updateModifyTime || updateBuyerRemark || updateVenderRemark)
                         {
@@ -191,7 +195,8 @@ namespace BBWYB.Server.Business.Sync
                                                                                 .SetIf(updateExpressName, o => o.ExpressName, qtOrder.DeliveryResponse.ExpressName)
                                                                                 .SetIf(updateModifyTime, o => o.ModifyTime, qtOrder.ModifyTime)
                                                                                 .SetIf(updateBuyerRemark, o => o.BuyerRemark, qtOrder.BuyerRemark)
-                                                                                .SetIf(updateVenderRemark, o => o.VenderRemark, qtOrder.VenderRemark);
+                                                                                .SetIf(updateVenderRemark, o => o.VenderRemark, qtOrder.VenderRemark)
+                                                                                .SetIf(updateBuyerAccount, o => o.BuyerAccount, qtOrder.UserAccount);
                             updateOrderList.Add(update);
                         }
                     }
diff --git a/BBWYB.Server.Model/Db/Order/Order.cs b/BBWYB.Server.Model/Db/Order/Order.cs
index 0028d72..ba3a625 100644
--- a/BBWYB.Server.Model/Db/Order/Order.cs
+++ b/BBWYB.Server.Model/Db/Order/Order.cs
@@ -19,6 +19,11 @@ namespace BBWYB.Server.Model.Db
 
         public string BuyerRemark { get; set; }
 
+        /// <summary>
+        /// 买家账号
+        /// </summary>
+        public string BuyerAccount { get; set; }
+
         /// <summary>
         /// 结束时间
         /// </summary>
diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs
index fa0f9bc..e3b7801 100644
--- a/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs
@@ -79,6 +79,11 @@
         /// </summary>
         public string BuyerRemark { get; set; }
 
+        /// <summary>
+        /// 买家账号
+        /// </summary>
+        public string BuyerAccount { get; set; }
+
         /// <summary>
         /// 商家备注
         /// </summary>