From 1c1280a6fd7a6f2c7bb5e4ed9c43eeaa4f9f4b9e Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 18 May 2023 16:51:51 +0800
Subject: [PATCH 1/3] 1

---
 .../BatchPurchase/BatchPurchaseBusiness.cs    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 5b4517d1..14dafed5 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -319,19 +319,22 @@ namespace BBWY.Server.Business
 
                         if (purchasePlatform == Enums.Platform.拳探)
                         {
-                            var skuPackConfig = request.PackSkuConfigList.FirstOrDefault(s => s.SkuId == firstProductParam.BelongSkuId);
-                            skuPackConfigList.Add(new
+                            var skuPackConfig = request.PackSkuConfigList?.FirstOrDefault(s => s.SkuId == firstProductParam.BelongSkuId);
+                            if (skuPackConfig != null)
                             {
-                                skuId = firstProductParam.BelongSkuId,
-                                skuCount = skuPackConfig.PurchaseCount,
-                                markMessage = string.Empty,
-                                wareHourses = skuPackConfig.PackSkuSplitConfigList.Select(x => new
+                                skuPackConfigList.Add(new
                                 {
-                                    wareId = x.Store.Id,
-                                    wareName = x.Store.Name,
-                                    count = x.PackCount
-                                })
-                            });
+                                    skuId = firstProductParam.BelongSkuId,
+                                    skuCount = skuPackConfig.PurchaseCount,
+                                    markMessage = string.Empty,
+                                    wareHourses = skuPackConfig.PackSkuSplitConfigList.Select(x => new
+                                    {
+                                        wareId = x.Store.Id,
+                                        wareName = x.Store.Name,
+                                        count = x.PackCount
+                                    })
+                                });
+                            }
                         }
                     }
 

From 6b98199784717ceb6578beaa610756bc3cc84e5f Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 18 May 2023 18:22:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 14dafed5..52e021e0 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -407,7 +407,7 @@ namespace BBWY.Server.Business
                         try
                         {
                             var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/",
-                                                                          "api/PackPurchaseTask/PublicPurchaseTask",
+                                                                          "api/PackPurchaseTask/BatchPublicPurchaseTask",
                                                                           qikuPackSkuConfigRequest,
                                                                           null,
                                                                           HttpMethod.Post);

From e726c861e1c457c4ede7c33d71580d5065bdd5d9 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 19 May 2023 13:47:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8CshopId=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=E6=8B=B3=E6=8E=A2=E5=95=86=E5=AE=B6Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 52e021e0..47385482 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -379,7 +379,8 @@ namespace BBWY.Server.Business
                         qikuPackSkuConfigRequestList.Add(new
                         {
                             orderId = purchaseOrderV2.Id,
-                            shopId = request.ShopId.ToString(),
+                            //shopId = request.ShopId.ToString(),
+                            shopId = purchaseGroup.Key,   //拳探店铺Id(商家Id)
                             originShopName = request.ShopName,
                             userName = purchaseAccount.AccountName,
                             platform = Enums.Platform.拳探,