From aaf2239bd8dc5909882e92a0141dff3b751cab0c Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 21 Mar 2024 23:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89spu=E6=9F=A5=E8=AF=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E9=87=87=E8=B4=AD=E6=96=B9=E6=A1=88=E7=9A=84=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E9=87=87=E8=B4=AD=E9=85=8D=E4=BB=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E9=87=87=E8=B4=AD=E9=85=8D=E4=BB=B6?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.API/Controllers/PurchaseSchemeController.cs       | 2 +-
 BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs
index 0665270..f2ebabb 100644
--- a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs
+++ b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs
@@ -65,7 +65,7 @@ namespace BBWYB.Server.API.Controllers
         /// <param name="productId"></param>
         /// <returns></returns>
         [HttpGet("{productId}")]
-        public IList<PurchaseSchemeProductSkuResponse> GetMergePurchaseSchemeProductSkuByProductId([FromRoute]string productId)
+        public IList<MergePurchaseSchemeProductSkuResponse> GetMergePurchaseSchemeProductSkuByProductId([FromRoute]string productId)
         {
             return purchaseSchemeBusiness.GetMergePurchaseSchemeProductSkuByProductId(productId, GetUserId());
         }
diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index c5f2213..7e1861a 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -1030,7 +1030,8 @@ namespace BBWYB.Server.Business
             var purchaseSchemeList = GetPurchaseSchemeList(new QuerySchemeRequest()
             {
                 ProductIdList = new List<string>() { productId },
-                BargainTeamIdList = user.isBargainTeam ? new List<string>() { user.user.DepartmentId } : null
+                BargainTeamIdList = user.isBargainTeam ? new List<string>() { user.user.DepartmentId } : null,
+                IncludePurchaseSkuBasicInfo = 1
             });
             var mergePssList = new List<MergePurchaseSchemeProductSkuResponse>();
             foreach (var scheme in purchaseSchemeList)