update:商品类型接口调整

application/modules/Goods/controllers/Goods.php

@@ -22,7 +22,8 @@ class GoodsController extends Base
      */
     public function get_goods_category_listAction()
     {
-        $categoryList = CategoryService::getCategoryList();
+        $name = empty($this->params["category_name"]) ? "" : $this->params["category_name"];
+        $categoryList = CategoryService::getCategoryList($name);
         $this->success(["result" => $categoryList]);
     }
 

application/services/goods/CategoryService.php

@@ -8,25 +8,34 @@ class CategoryService
 {
     /**
      * 商品分类列表数据
+     * @param string $name
      * @return array
      */
-    public static function getCategoryList()
+    public static function getCategoryList($name = "")
     {
-        //todo::加上redis
-        $allCategoryList = Category::getRecordList([], ['category_id', 'parent_category_id', 'name', 'level']);
+        $where = [];
+        if (!empty($name)) {
+            $where["name[~]"] = "%" . $name . "%";
+            $where["level"] = Category::LEVEL_2;
+        }
+        $allCategoryList = Category::getRecordList($where, ['category_id', 'parent_category_id', 'name', 'level']);
         $data = [];
         if (!empty($allCategoryList)) {
+            $levelOneIdKeys = [];
             foreach ($allCategoryList as $caregory) {
-                if ($caregory["level"] == Category::LEVEL_1) {
-                    $data[] = [
-                        "category_id" => $caregory["category_id"],
-                        "name" => $caregory["name"],
-                    ];
-                }
+                $levelOneIdKeys[$caregory["parent_category_id"]] = 1;
             }
-            foreach ($data as $key=>$item) {
-                foreach ($allCategoryList as $caregory) {
-                    if ($caregory["level"] == Category::LEVEL_2 && $caregory["parent_category_id"] == $item["category_id"]) {
+            $levelOneIds = array_keys($levelOneIdKeys);
+            $levelOneCategoryList = Category::getRecordList(["category_id" => $levelOneIds], ['category_id', 'parent_category_id', 'name', 'level']);
+            foreach ($levelOneCategoryList as $key => $levelOneCategory) {
+                $data[] = [
+                    "category_id" => $levelOneCategory["category_id"],
+                    "name" => $levelOneCategory["name"],
+                ];
+            }
+            foreach ($allCategoryList as $caregory) {
+                foreach ($data as $key => $item) {
+                    if ($item["category_id"] == $caregory["parent_category_id"] && $caregory["level"] != Category::LEVEL_1) {
                         $data[$key]["sub_list"][] = [
                             "category_id" => $caregory["category_id"],
                             "name" => $caregory["name"],