合并分支 'develop' 到 'master'

Develop



查看合并请求 !386

@@ -40,7 +40,7 @@ class CategoryController extends BaseController
             $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST);//获取模版id
             $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST);//获取模版id
             foreach ($list as $k =>$v){
             foreach ($list as $k =>$v){
                 $v['url'] = $this->user['domain'] . $v['route'].'/';
                 $v['url'] = $this->user['domain'] . $v['route'].'/';
-                $v['product_num'] = Category::getProductNum($v['id']);
+                $v['product_num'] = $category->getProductNum($v['id']);
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST,$template_id,$v['id']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST,$template_id,$v['id']);
                 $list[$k] = $v;
                 $list[$k] = $v;

@@ -41,7 +41,23 @@ class Category extends Base
         return $ids;
         return $ids;
     }
     }
 
 
-
+    /**
+     * @remark :获取当前id下所有子集
+     * @name   :getAllSub
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/18 15:10
+     */
+    public function getAllSub($id,&$str = []){
+        $list = $this->list(['pid'=>$id,'status'=>1],['id','pid']);
+        if(!empty($list)){
+            foreach ($list as $v){
+                $str[] = $v['id'];
+                $this->getAllSub($v['id'],$str);
+            }
+        }
+        return $str;
+    }
 
 
     /**
     /**
      * 关联产品数量
      * 关联产品数量
@@ -50,8 +66,9 @@ class Category extends Base
      * @author zbj
      * @author zbj
      * @date 2023/4/28
      * @date 2023/4/28
      */
      */
-    public static function getProductNum($cate_id){
-        $cate_ids = self::getChildIdsArr($cate_id);
+    public function getProductNum($cate_id){
+        $str = [];
+        $cate_ids = $this->getAllSub($cate_id,$str);
         $count = CategoryRelated::whereIn('cate_id',$cate_ids)->count();
         $count = CategoryRelated::whereIn('cate_id',$cate_ids)->count();
 //        $str = 0;
 //        $str = 0;
         return $count;
         return $count;