From 299a266cac6ca5f294dbd97f5d4b0083fa66e87e Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 22 Jun 2022 20:24:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=A2=E5=8D=95v2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/Order/OrderDropShipping.cs       |  5 ++++-
 .../Views/Order/RelationPurchaseOrder.xaml.cs       |  1 +
 BBWY.Server.Business/Order/OrderBusiness.cs         | 13 +++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/BBWY.Client/Models/Order/OrderDropShipping.cs b/BBWY.Client/Models/Order/OrderDropShipping.cs
index d985ee44..c0d0f082 100644
--- a/BBWY.Client/Models/Order/OrderDropShipping.cs
+++ b/BBWY.Client/Models/Order/OrderDropShipping.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
@@ -38,6 +39,7 @@ namespace BBWY.Client.Models
             }
         }
 
+        [JsonIgnore]
         public string PurchaseFreightStr
         {
             get => purchaseFreightStr; set
@@ -67,6 +69,7 @@ namespace BBWY.Client.Models
             OnPurchaseAmountChanged?.Invoke();
         }
 
+        [JsonIgnore]
         public Action OnPurchaseAmountChanged { get; set; }
 
         public object Clone()
diff --git a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs
index 35af9b7a..1dad14bb 100644
--- a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs
+++ b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs
@@ -86,6 +86,7 @@ namespace BBWY.Client.Views.Order
 
             AddOrderDropShippingCommand = new RelayCommand(() => OrderDropShippingList.Add(new OrderDropShipping()
             {
+                OrderId = this.OrderId,
                 BuyerAccount = PurchaseAccountList.FirstOrDefault()?.AccountName,
                 OnPurchaseAmountChanged = OnPurchaseAmountChanged
             }));
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index b90cd770..6540b26a 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -1054,12 +1054,21 @@ namespace BBWY.Server.Business
             {
                 deletePurchaseOrder.ExecuteAffrows();
                 deleteOrderCostDetail.ExecuteAffrows();
-                foreach (var updateOrderSku in updateOrderSkuList)
-                    updateOrderSku.ExecuteAffrows();
+                foreach (var update in updateOrderSkuList)
+                    update.ExecuteAffrows();
                 fsql.Insert(insertPurchaseOrderList).ExecuteAffrows();
                 fsql.Insert(insertOrderCostDetailList).ExecuteAffrows();
                 insertOrderCost?.ExecuteAffrows();
                 updateOrderCost?.ExecuteAffrows();
+                if (insertOrderDropShippingList.Count() > 0)
+                    fsql.Insert(insertOrderDropShippingList).ExecuteAffrows();
+                if (updateOrderDropShippingList.Count() > 0)
+                {
+                    foreach (var update in updateOrderDropShippingList)
+                    {
+                        fsql.Update<OrderDropShipping>().SetSource(update).IgnoreColumns(new string[] { "CreateTime", "ShopId" });
+                    }
+                }
 
                 if (dbOrder.StorageType != Enums.StorageType.代发)
                 {