From 7ecbeb13733783f67d7ab5050f8c8065facde0bc Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@live.com>
Date: Thu, 22 Feb 2024 15:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E5=8E=9F=E5=85=88=E7=9A=84=E5=8F=AA=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BA=8C=E7=BA=A7=E5=88=86=E7=B1=BB=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E9=80=92=E5=BD=92=E8=8E=B7=E5=8F=96=E6=97=A0=E9=99=90?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/DTO/WxGoodCategoryDto.cs       | 25 +-------
 .../Controllers/GoodController.cs             | 61 ++++++++-----------
 2 files changed, 28 insertions(+), 58 deletions(-)

diff --git a/CoreCms.Net.Model/ViewModels/DTO/WxGoodCategoryDto.cs b/CoreCms.Net.Model/ViewModels/DTO/WxGoodCategoryDto.cs
index d9ef072a..f7c88477 100644
--- a/CoreCms.Net.Model/ViewModels/DTO/WxGoodCategoryDto.cs
+++ b/CoreCms.Net.Model/ViewModels/DTO/WxGoodCategoryDto.cs
@@ -35,29 +35,6 @@ namespace CoreCms.Net.Model.ViewModels.DTO
         /// </summary>
         public string imageUrl { get; set; }
 
-        public List<WxGoodCategoryChild> child { get; set; }
-    }
-
-    public class WxGoodCategoryChild
-    {
-        /// <summary>
-        ///     序列
-        /// </summary>
-        public int id { get; set; }
-
-        /// <summary>
-        ///     标题
-        /// </summary>
-        public string name { get; set; }
-
-        /// <summary>
-        ///     排序
-        /// </summary>
-        public int sort { get; set; }
-
-        /// <summary>
-        ///     图片地址
-        /// </summary>
-        public string imageUrl { get; set; }
+        public List<WxGoodCategoryDto>? child { get; set; }
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
index 2c37efc1..5eef1832 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs
@@ -109,46 +109,39 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             var jm = new WebApiCallBack() { status = true };
 
             var data = await _goodsCategoryServices.QueryListByClauseAsync(p => p.isShow == true, p => p.sort, OrderByType.Asc, true, true);
-            var wxGoodCategoryDto = new List<WxGoodCategoryDto>();
 
-            var parents = data.Where(p => p.parentId == 0).ToList();
-            if (parents.Any())
-            {
-                parents.ForEach(p =>
-                {
-                    var model = new WxGoodCategoryDto
-                    {
-                        id = p.id,
-                        name = p.name,
-                        imageUrl = !string.IsNullOrEmpty(p.imageUrl) ? p.imageUrl : "/static/images/common/empty.png",
-                        sort = p.sort
-                    };
-
-                    var childs = data.Where(p => p.parentId == model.id).ToList();
-                    if (childs.Any())
-                    {
-                        var childsList = new List<WxGoodCategoryChild>();
-                        childs.ForEach(o =>
-                        {
-                            childsList.Add(new WxGoodCategoryChild()
-                            {
-                                id = o.id,
-                                imageUrl = !string.IsNullOrEmpty(o.imageUrl) ? o.imageUrl : "/static/images/common/empty.png",
-                                name = o.name,
-                                sort = o.sort
-                            });
-                        });
-                        model.child = childsList;
-                    }
-                    wxGoodCategoryDto.Add(model);
-                });
-            }
             jm.status = true;
-            jm.data = wxGoodCategoryDto;
+            jm.data = GetCategories(data, 0);
 
             return jm;
         }
 
+        /// <summary>
+        /// 迭代方法
+        /// </summary>
+        /// <param name="oldCategories"></param>
+        /// <param name="parentId"></param>
+        /// <returns></returns>
+        private static List<WxGoodCategoryDto> GetCategories(List<CoreCmsGoodsCategory> oldCategories, int parentId)
+        {
+            List<WxGoodCategoryDto> childTree = new List<WxGoodCategoryDto>();
+            var model = oldCategories.Where(p => p.parentId == parentId).ToList();
+            foreach (var item in model)
+            {
+                var parentTree = new WxGoodCategoryDto();
+                parentTree.id = item.id;
+                parentTree.imageUrl = !string.IsNullOrEmpty(item.imageUrl) ? item.imageUrl : "/static/images/common/empty.png";
+                parentTree.name = item.name;
+                parentTree.sort = item.sort;
+
+                childTree.Add(parentTree);
+
+                parentTree.child = GetCategories(oldCategories, item.id);
+            }
+            return childTree;
+        }
+
+
         #endregion
 
         #region 根据查询条件获取分页数据============================================================