From ed0b6b7b426e0c4f1b0922b6c037124edd3aae59 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Sun, 24 Mar 2024 20:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4spu=E5=92=8C=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PurchaseSchemeController.cs       |  8 ++++----
 .../PurchaseScheme/PurchaseSchemeBusiness.cs      |  5 +++--
 ...chemeProductSkuBySameSpuAndPurchaserRequest.cs | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 BBWYB.Server.Model/Dto/Request/PurchaseScheme/GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest.cs

diff --git a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs
index a5c40f1..28b3904 100644
--- a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs
+++ b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs
@@ -60,14 +60,14 @@ namespace BBWYB.Server.API.Controllers
         }
 
         /// <summary>
-        /// 按spu查询所有采购方案的所有采购配件列表 (议价组只查询和自己有关的采购方案)
+        /// 按spu和采购商查询采购方案的采购配件列表并合并返回列表结果 (议价组只查询和自己有关的采购方案)
         /// </summary>
-        /// <param name="productId"></param>
+        /// <param name="request"></param>
         /// <returns></returns>
         [HttpGet("{productId}")]
-        public IList<MergePurchaseSchemeProductSkuResponse> GetMergePurchaseSchemeProductSkuByProductId([FromRoute] string productId)
+        public IList<MergePurchaseSchemeProductSkuResponse> GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaser([FromBody] GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest request)
         {
-            return purchaseSchemeBusiness.GetMergePurchaseSchemeProductSkuByProductId(productId, GetUserId());
+            return purchaseSchemeBusiness.GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaser(request, GetUserId());
         }
 
         /// <summary>
diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index f43805f..dd00651 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -1068,12 +1068,13 @@ namespace BBWYB.Server.Business
             return purchaseSchemeList;
         }
 
-        public IList<MergePurchaseSchemeProductSkuResponse> GetMergePurchaseSchemeProductSkuByProductId(string productId, string userId)
+        public IList<MergePurchaseSchemeProductSkuResponse> GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaser(GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest request, string userId)
         {
             var user = userBusiness.GetisBargainTeamByUserId(userId);
             var purchaseSchemeList = GetPurchaseSchemeList(new QuerySchemeRequest()
             {
-                ProductIdList = new List<string>() { productId },
+                ProductIdList = new List<string>() { request.ProductId },
+                PurchaserId = request.PurchaserId,
                 BargainTeamIdList = user.isBargainTeam ? new List<string>() { user.bargainTeam.Id } : null,
                 IncludePurchaseSkuBasicInfo = 1
             });
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest.cs
new file mode 100644
index 0000000..208bcd1
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest.cs
@@ -0,0 +1,15 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest
+    {
+        /// <summary>
+        /// SPU
+        /// </summary>
+        public string ProductId { get; set; }
+
+        /// <summary>
+        /// 采购商Id
+        /// </summary>
+        public string PurchaserId { get; set; }
+    }
+}