From f04ede2080a2542539ee3daddcf0fb6d8ee03ed2 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 8 Dec 2023 11:05:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=8A=A0=E5=92=8C=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=89=8D=20=E6=9C=AC=E5=9C=B0=E5=BA=8F=E5=88=97=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APIServices/PurchaseOrderService.cs       | 23 ++++---------------
 BBWY.Client/GlobalContext.cs                  |  2 +-
 .../Models/PurchaseOrder/CargoParam.cs        | 17 ++++++++++++++
 .../Purchase/1688PreviewPurchaseViewModel.cs  | 23 +++++++++++++++++--
 4 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 BBWY.Client/Models/PurchaseOrder/CargoParam.cs

diff --git a/BBWY.Client/APIServices/PurchaseOrderService.cs b/BBWY.Client/APIServices/PurchaseOrderService.cs
index cfda899b..27893f6f 100644
--- a/BBWY.Client/APIServices/PurchaseOrderService.cs
+++ b/BBWY.Client/APIServices/PurchaseOrderService.cs
@@ -57,20 +57,13 @@ namespace BBWY.Client.APIServices
         /// <param name="consignee"></param>
         /// <param name="purchaseSchemeProductSkuList"></param>
         /// <returns></returns>
-        public ApiResponse<PreviewOrderResponse> PreviewPurchaseOrder(Consignee consignee, IList<PurchaseSchemeProductSku> purchaseSchemeProductSkuList, Platform purchasePlatform, PurchaseAccount purchaseAccount, PurchaseOrderMode purchaseOrderMode)
+        public ApiResponse<PreviewOrderResponse> PreviewPurchaseOrder(Consignee consignee, List<CargoParam> cargoParamList, Platform purchasePlatform, PurchaseAccount purchaseAccount, PurchaseOrderMode purchaseOrderMode)
         {
             return SendRequest<PreviewOrderResponse>(globalContext.BBYWApiHost, "api/purchaseOrder/PreviewPurchaseOrder", new
             {
                 purchaseOrderMode,
                 consignee,
-                CargoParamList = purchaseSchemeProductSkuList.Select(sku => new
-                {
-                    ProductId = sku.PurchaseProductId,
-                    SkuId = sku.PurchaseSkuId,
-                    SpecId = sku.PurchaseSkuSpecId,
-                    Quantity = sku.ItemTotal,
-                    BelongSkuId = sku.SkuId
-                }),
+                CargoParamList = cargoParamList,
                 Platform = purchasePlatform,
                 AppKey = purchaseAccount.AppKey,
                 AppSecret = purchaseAccount.AppSecret,
@@ -99,7 +92,7 @@ namespace BBWY.Client.APIServices
         /// <param name="extensions"></param>
         /// <returns></returns>
         public ApiResponse<object> FastCreateOrder(Consignee consignee,
-                                                   IList<PurchaseSchemeProductSku> purchaseSchemeProductSkuList,
+                                                   List<CargoParam> cargoParamList,
                                                    Platform purchasePlatform,
                                                    PurchaseAccount purchaseAccount,
                                                    PurchaseOrderMode purchaseOrderMode,
@@ -118,15 +111,7 @@ namespace BBWY.Client.APIServices
             {
                 purchaseOrderMode,
                 consignee,
-                CargoParamList = purchaseSchemeProductSkuList.Select(sku => new
-                {
-                    ProductId = sku.PurchaseProductId,
-                    SkuId = sku.PurchaseSkuId,
-                    SpecId = sku.PurchaseSkuSpecId,
-                    Quantity = sku.ItemTotal,
-                    BelongSkuId = sku.SkuId,
-                    SchemeId = sku.SkuPurchaseSchemeId
-                }),
+                CargoParamList = cargoParamList,
                 Platform = purchasePlatform,
                 purchaseAccount.AppKey,
                 purchaseAccount.AppSecret,
diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index c63fb25d..2f6a278e 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10216";
+            ClientVersion = "10217";
         }
 
 
diff --git a/BBWY.Client/Models/PurchaseOrder/CargoParam.cs b/BBWY.Client/Models/PurchaseOrder/CargoParam.cs
new file mode 100644
index 00000000..68e2714b
--- /dev/null
+++ b/BBWY.Client/Models/PurchaseOrder/CargoParam.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models
+{
+    public class CargoParam
+    {
+        public string ProductId { get; set; }
+        public string SkuId { get; set; }
+        public string SpecId { get; set; }
+        public int Quantity { get; set; }
+        public string BelongSkuId { get; set; }
+
+        public long? SchemeId { get; set; }
+    }
+}
diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
index d3aec609..f9022b7d 100644
--- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
+++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
@@ -11,6 +11,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
+using Newtonsoft.Json;
 
 namespace BBWY.Client.ViewModels
 {
@@ -245,6 +246,15 @@ namespace BBWY.Client.ViewModels
             }
             #endregion
 
+            var cargoParamList = PurchaseSchemeProductSkuList.Select(sku => new CargoParam
+            {
+                ProductId = sku.PurchaseProductId,
+                SkuId = sku.PurchaseSkuId,
+                SpecId = sku.PurchaseSkuSpecId,
+                Quantity = sku.ItemTotal,
+                BelongSkuId = sku.SkuId
+            }).ToList();
+
             IsLoading = true;
             Task.Factory.StartNew(() => purchaseOrderService.PreviewPurchaseOrder(new Consignee()
             {
@@ -256,7 +266,7 @@ namespace BBWY.Client.ViewModels
                 Province = Province,
                 TelePhone = Mobile,
                 Town = Town
-            }, PurchaseSchemeProductSkuList, purchaseAccount.PurchasePlatformId, purchaseAccount, PurchaseOrderMode))
+            }, cargoParamList, purchaseAccount.PurchasePlatformId, purchaseAccount, PurchaseOrderMode))
                         .ContinueWith(t =>
                         {
                             IsLoading = false;
@@ -296,6 +306,15 @@ namespace BBWY.Client.ViewModels
                 MessageBox.Show("收货人信息不全", "下单");
                 return;
             }
+            var cargoParamList = PurchaseSchemeProductSkuList.Select(sku => new CargoParam
+            {
+                ProductId = sku.PurchaseProductId,
+                SkuId = sku.PurchaseSkuId,
+                SpecId = sku.PurchaseSkuSpecId,
+                Quantity = sku.ItemTotal,
+                BelongSkuId = sku.SkuId,
+                SchemeId = sku.SkuPurchaseSchemeId
+            }).ToList();
 
             IsLoading = true;
             Task.Factory.StartNew(() => purchaseOrderService.FastCreateOrder(new Consignee()
@@ -308,7 +327,7 @@ namespace BBWY.Client.ViewModels
                 Province = Province,
                 TelePhone = Mobile,
                 Town = Town
-            }, PurchaseSchemeProductSkuList,
+            }, cargoParamList,
                purchaseAccount.PurchasePlatformId,
                purchaseAccount,
                PurchaseOrderMode,