gx视频任务

@@ -21,14 +21,6 @@ class Kernel extends ConsoleKernel
         // $schedule->command('inspire')->hourly();
         $schedule->command('remain_day')->dailyAt('09:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
-//        $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
-//        $schedule->command('rank_data')->dailyAt('08:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
-//        $schedule->command('rank_data_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
-//        $schedule->command('rank_data_external_links')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
-//        $schedule->command('rank_data_external_links')->dailyAt('18:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
-//        $schedule->command('rank_data_indexed_pages')->dailyAt('07:30')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
-//        $schedule->command('rank_data_recomm_domain')->dailyAt('07:40')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
-//        $schedule->command('rank_data_week')->weeklyOn([1,2], '08:30')->withoutOverlapping(1); // 排名数据，每周一、二早上执行一次
         $schedule->command('service_count')->dailyAt('01:00')->withoutOverlapping(1); //服务器使用情况，每天凌晨1点执行一次
         $schedule->command('web_traffic_special')->everyMinute()->withoutOverlapping(1); // 特殊引流
         $schedule->command('web_traffic_russia_special')->everyMinute()->withoutOverlapping(1); // 特殊引流
@@ -43,8 +35,6 @@ class Kernel extends ConsoleKernel
         $schedule->command('update_keyword_route')->dailyAt('01:00')->withoutOverlapping(1); //升级项目--清除路由相同的关键字
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         $schedule->command('update_keyword_content')->hourly()->withoutOverlapping(1);
-        // 每日推送视频任务
-//        $schedule->command('video_task')->hourly()->withoutOverlapping(1);
         // 每日推送已完成视频任务项目生成对应界面
         $schedule->command('notice_c')->dailyAt('04:00')->withoutOverlapping(1);
     }

@@ -215,6 +215,26 @@ if (!function_exists('_get_child')) {
     }
 }
 
+if (!function_exists('_get_all_sub')) {
+    /**
+     * 獲取所有子集id
+     * @param int
+     * @return array
+     */
+    function _get_all_sub($my_id,$id_Arr)
+    {
+        $new_arr = array();
+        foreach ($id_Arr as $v) {
+            if ($v['pid'] == $my_id) {
+                $new_arr[] = $v['id'];
+                // 递归查找子节点的子节点
+                $new_arr = array_merge($new_arr, _get_all_sub($v['id'], $id_Arr));
+            }
+        }
+        return $new_arr ? $new_arr : [];
+    }
+}
+
 
 if (!function_exists('checkDomain')) {
     /**

@@ -210,4 +210,5 @@ class BaseLogic extends Logic
         ];
         return http_post($c_url, json_encode($param));
     }
+
 }

@@ -406,13 +406,31 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/8/9 10:17
      */
     public function getStatusNumber(){
+        $map = [];
         //三种状态 0：草稿 1：发布 2：回收站
         $data = ['dra'=>0,'pub'=>1,'del'=>2,'tal'=>3];
         foreach ($data as $k => $v){
+            //查詢所有分類
+            $cateModel = new Category();
+            $cateList = $cateModel->list(['status'=>1],'id',['id','pid']);
+            if(!empty($cateList) && !isset($this->param['featured_status'])){
+                $featured_ids = $cateModel->where('title', 'like', '%Featured%')->pluck('id')->toArray();
+                //获取当前的子集
+                $featured_arr = [];
+                foreach ($featured_ids as $id){
+                    $featured_arr = array_values(array_unique(_get_all_sub($id,$cateList)));
+                }
+                if(!empty($featured_arr)){
+                    $cateRelated = new CategoryRelated();
+                    $product_ids = $cateRelated->whereNotIn('cate_id',$featured_arr)->pluck('product_id')->unique()->toArray();
+                    $map['id'] = ['in',$product_ids];
+                }
+            }
             if($v == 3){
-                $data[$k] = $this->model->where(['project_id'=>$this->user['project_id']])->count();
+                $data[$k] = $this->model->formatQuery($map)->count();
             }else{
-                $data[$k] = $this->model->where(['status'=>$v,'project_id'=>$this->user['project_id']])->count();
+                $map['status'] = $v;
+                $data[$k] = $this->model->formatQuery($map)->count();
             }
         }
         return $this->success($data);