From 8ce6e7a7ebeaf295acd63402605b0d88093f988a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Fri, 13 Jan 2023 02:33:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=89=A9=E5=B1=95=E5=88=86=E7=B1=BB=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/GoodController.cs                | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
index a41e5417..7ec11e0c 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
@@ -59,6 +59,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         private ICoreCmsAgentServices _agentServices;
         private ICoreCmsAgentProductsServices _agentProductsServices;
         private ICoreCmsAgentGradeServices _agentGradeServices;
+        private ICoreCmsGoodsCategoryExtendServices _goodsCategoryExtendServices;
 
         /// <summary>
         /// 构造函数
@@ -75,7 +76,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             , ICoreCmsGoodsParamsServices goodsParamsServices
             , ICoreCmsGoodsCollectionServices goodsCollectionServices
             , ICoreCmsUserServices userServices
-            , ICoreCmsAgentServices agentServices, ICoreCmsAgentProductsServices agentProductsServices, ICoreCmsAgentGradeServices agentGradeServices)
+            , ICoreCmsAgentServices agentServices, ICoreCmsAgentProductsServices agentProductsServices, ICoreCmsAgentGradeServices agentGradeServices, ICoreCmsGoodsCategoryExtendServices goodsCategoryExtendServices)
         {
             _mapper = mapper;
             _user = user;
@@ -92,6 +93,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             _agentServices = agentServices;
             _agentProductsServices = agentProductsServices;
             _agentGradeServices = agentGradeServices;
+            _goodsCategoryExtendServices = goodsCategoryExtendServices;
         }
 
         //公共接口====================================================================================================
@@ -205,7 +207,17 @@ namespace CoreCms.Net.Web.WebApi.Controllers
 
                         var categories = await _goodsCategoryServices.QueryAsync(true, true);
                         var ids = GoodsHelper.GetChildIds(categories, catId);
-                        where = where.And(p => ids.Contains(p.goodsCategoryId));
+                        //扩展分类
+                        var extends = await _goodsCategoryExtendServices.QueryListByClauseAsync(p => p.goodsCategroyId == catId);
+                        if (extends.Any())
+                        {
+                            var extGoodIds = extends.Select(p => p.goodsId).ToList();
+                            where = where.And(p => ids.Contains(p.goodsCategoryId) || extGoodIds.Contains(p.id));
+                        }
+                        else
+                        {
+                            where = where.And(p => ids.Contains(p.goodsCategoryId));
+                        }
                     }
                 }
                 if (!string.IsNullOrWhiteSpace(obj.brandId))