From e8599b2426ebbeaab1af45e5ac41edc86065bf8f Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 17 May 2023 16:58:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8B=B3=E6=8E=A2=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E6=89=A9=E5=B1=95=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E5=8E=BB=E6=8E=89SourceSku,=20?=
 =?UTF-8?q?=E6=94=B9=E6=88=90BelongSkus=20(object)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformSDK/QuanTanBusiness.cs                |  6 +++---
 .../BatchPurchase/BatchPurchaseBusiness.cs        | 15 ++++++++++++++-
 .../CreateOnlinePurchaseOrderRequest.cs           |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
index a3b14c1c..c52a4bba 100644
--- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
@@ -23,13 +23,13 @@ namespace BBWY.Server.Business
 
         public override PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest)
         {
-            
+
             var qtResponse = quanTanOrderClient.PayOrder(new QuanTanPayOrderRequest
             {
                 orderId = payPurchaseOrderRequest.OrderId,
                 userAccount = payPurchaseOrderRequest.AppToken
             }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
-            if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState= PurchaseOrderState.待发货 };
+            if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = PurchaseOrderState.待发货 };
 
             if (qtResponse.Message != null && qtResponse.Message.Contains("已支付"))
             {
@@ -163,7 +163,7 @@ namespace BBWY.Server.Business
                 extended = JsonConvert.SerializeObject(new
                 {
                     BuyerAccount = createOnlinePurchaseOrderRequest.AppToken,
-                    createOnlinePurchaseOrderRequest.SourceSku,
+                    BelongSkus = createOnlinePurchaseOrderRequest.SourceSku,
                     createOnlinePurchaseOrderRequest.SourceShopName
                 })
             };
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 628c6e6b..d1a87b2c 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -242,6 +242,19 @@ namespace BBWY.Server.Business
                     else if (purchasePlatform == Enums.Platform.阿里巴巴)
                         tradeMode = extJson.Value<string>("OrderTradeTypeCode");
 
+
+                    #region 处理JD SKU和拳探SKU的对应关系
+                    var belongSkus_mappingList = new List<JObject>();
+                    foreach (var belongSkuGroup in belongSkuGroups)
+                    {
+                        var firstProductParam = belongSkuGroup.FirstOrDefault();
+                        if (!belongSkus_mappingList.Any(j => j.Value<string>("BelongSkuId") == firstProductParam.BelongSkuId))
+                        {
+                            belongSkus_mappingList.Add(JObject.FromObject(new { firstProductParam.BelongSkuId, SkuId = firstProductParam.PurchaseSkuId }));
+                        }
+                    }
+                    #endregion
+
                     var createOrderResponse = platformSDKBusinessList.FirstOrDefault(p => p.Platform == purchasePlatform)
                                                                      .FastCreateOrder(new CreateOnlinePurchaseOrderRequest()
                                                                      {
@@ -253,7 +266,7 @@ namespace BBWY.Server.Business
                                                                          PurchaseOrderMode = request.PurchaseOrderMode,
                                                                          Remark = request.Remark,
                                                                          SourceShopName = request.ShopName,
-                                                                         SourceSku = string.Join(",", belongSkuGroups.Select(g => g.Key)),
+                                                                         SourceSku = belongSkus_mappingList,
                                                                          CargoParamList = productParamList.Select(p => new CargoParamRequest()
                                                                          {
                                                                              ProductId = p.PurchaseProductId,
diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
index 62f3d1db..a26ba6e7 100644
--- a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
@@ -48,7 +48,7 @@
         public string Extensions { get; set; }
 
 
-        public string SourceSku { get; set; }
+        public object SourceSku { get; set; }
 
         public string SourceShopName { get; set; }