调整spu和供应商查询接口

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>

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
             });

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; }
+    }
+}