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 } /// - /// 按spu查询所有采购方案的所有采购配件列表 (议价组只查询和自己有关的采购方案) + /// 按spu和采购商查询采购方案的采购配件列表并合并返回列表结果 (议价组只查询和自己有关的采购方案) /// - /// + /// /// [HttpGet("{productId}")] - public IList GetMergePurchaseSchemeProductSkuByProductId([FromRoute] string productId) + public IList GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaser([FromBody] GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest request) { - return purchaseSchemeBusiness.GetMergePurchaseSchemeProductSkuByProductId(productId, GetUserId()); + return purchaseSchemeBusiness.GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaser(request, GetUserId()); } /// 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 GetMergePurchaseSchemeProductSkuByProductId(string productId, string userId) + public IList GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaser(GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest request, string userId) { var user = userBusiness.GetisBargainTeamByUserId(userId); var purchaseSchemeList = GetPurchaseSchemeList(new QuerySchemeRequest() { - ProductIdList = new List() { productId }, + ProductIdList = new List() { request.ProductId }, + PurchaserId = request.PurchaserId, BargainTeamIdList = user.isBargainTeam ? new List() { 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 + { + /// + /// SPU + /// + public string ProductId { get; set; } + + /// + /// 采购商Id + /// + public string PurchaserId { get; set; } + } +}