From 2a8560760484922e153ae6f567715b8e118b0f9d Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Tue, 2 Jan 2024 11:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=B3=E6=8E=A2=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=A2=9E=E5=8A=A0=E7=88=B6=E7=BA=A7=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DataRepairController.cs       |  2 +-
 ...n_Supplier_SearchProductCategoryRequest.cs |  5 +++
 .../Client/Impl/OP_QuanTanClient.cs           | 34 +++++++++++++------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/BBWYB.Server.API/Controllers/DataRepairController.cs b/BBWYB.Server.API/Controllers/DataRepairController.cs
index 9d0640b..bd03010 100644
--- a/BBWYB.Server.API/Controllers/DataRepairController.cs
+++ b/BBWYB.Server.API/Controllers/DataRepairController.cs
@@ -119,7 +119,7 @@ namespace BBWYB.Server.API.Controllers
         [HttpGet]
         public void Test()
         {
-            dataRepairBusiness.Test();
+            dataRepairBusiness.Test("广东省");
         }
     }
 }
diff --git a/QuanTan.SDK/Models/Supplier/Request/Product/QuanTan_Supplier_SearchProductCategoryRequest.cs b/QuanTan.SDK/Models/Supplier/Request/Product/QuanTan_Supplier_SearchProductCategoryRequest.cs
index 11ea8fb..a66b13c 100644
--- a/QuanTan.SDK/Models/Supplier/Request/Product/QuanTan_Supplier_SearchProductCategoryRequest.cs
+++ b/QuanTan.SDK/Models/Supplier/Request/Product/QuanTan_Supplier_SearchProductCategoryRequest.cs
@@ -9,5 +9,10 @@
         public int pageSize { get; set; } = 20;
 
         public int page { get; set; } = 1;
+
+        /// <summary>
+        /// 分类层级 0/1/2 默认2
+        /// </summary>
+        public int? categoryLevel { get; set; } = 2;
     }
 }
diff --git a/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs b/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
index cb3cd6d..de41b19 100644
--- a/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
+++ b/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
@@ -1,5 +1,6 @@
 using BBWYB.Common.Http;
 using BBWYB.Common.Models;
+using com.alibaba.openapi.client;
 using QuanTan.SDK.Client.Supplier;
 using QuanTan.SDK.Models.Supplier;
 using SDKAdapter.OperationPlatform.Models;
@@ -249,20 +250,31 @@ namespace SDKAdapter.OperationPlatform.Client
 
         public override OP_ListResponse<OP_ProductCategoryResponse> GetProductCategoryList(OP_QueryProductCategoryRequest request)
         {
-            var qtResponse = supplier_ProductClient.GetProductCategoryList(new QuanTan_Supplier_SearchProductCategoryRequest()
+            var levels = new List<int>() { 0, 1, 2 };
+            var items = new List<OP_ProductCategoryResponse>();
+            foreach (var level in levels)
             {
-                page = request.PageIndex,
-                pageSize = request.PageSize
-            }, request.AppKey, request.AppSecret);
+                var qtResponse = supplier_ProductClient.GetProductCategoryList(new QuanTan_Supplier_SearchProductCategoryRequest()
+                {
+                    page = request.PageIndex,
+                    pageSize = request.PageSize,
+                    categoryLevel = level
+                }, request.AppKey, request.AppSecret);
+                if (qtResponse.Data.List != null && qtResponse.Data.List.Count() > 0)
+                {
+                    items.AddRange(qtResponse.Data.List.Select(x => new OP_ProductCategoryResponse()
+                    {
+                        CategoryId = x.CategoryId,
+                        CategoryName = x.CategoryName,
+                        CategoryPath = x.CategoryPath
+                    }).ToList());
+                }
+            }
+
             return new OP_ListResponse<OP_ProductCategoryResponse>()
             {
-                Count = qtResponse.Data.Count,
-                Items = qtResponse.Data.List != null && qtResponse.Data.List.Count() > 0 ? qtResponse.Data.List.Select(x => new OP_ProductCategoryResponse()
-                {
-                    CategoryId = x.CategoryId,
-                    CategoryName = x.CategoryName,
-                    CategoryPath = x.CategoryPath
-                }).ToList() : null
+                Count = items.Count,
+                Items = items
             };
         }
     }