合并分支 'lyh-server' 到 'master'

整改推荐供应商



查看合并请求 !1437

@@ -57,12 +57,11 @@ class RecommendedSuppliers extends Command
     {
         $project_list =  $this->deployBuildModel->list(['is_supplier'=>1]);//TODO::已开启推荐供应商
         foreach ($project_list as $v){
-            echo date('Y-m-d H:i:s') . 'project_id:'.$v['project_id'] . PHP_EOL;
+            echo date('Y-m-d H:i:s') . '推荐供应商执行的project_id:'.$v['project_id'] . PHP_EOL;
             $result = $this->countPurchaser($v);
             if($result !== false){
                 ProjectServer::useProject($v['project_id']);
                 $title = $this->getKeywords($v['project_id']);
-                echo date('Y-m-d H:i:s') . '开始:'.$v['project_id'] . PHP_EOL;
                 $this->savePurchaser($v['project_id'],$title);
                 DB::disconnect('custom_mysql');
             }
@@ -87,6 +86,7 @@ class RecommendedSuppliers extends Command
             $plan = ['专业版'=>300, '标准版'=>500, '商务版'=>800, '旗舰版'=>1200];
             $total_number = $plan[Project::planMap()[$v['plan']]] ?? 300;
             if($count > $total_number){
+                echo date('Y-m-d H:i:s') . '达到数量上线关闭的项目:'.$v['project_id'] . PHP_EOL;
                 //更新数量上限字段,并关闭推荐供应商
                 $this->deployBuildModel->edit(['is_purchaser_count'=>1,'is_supplier'=>0],['project_id'=>$v['project_id']]);
                 return false;

@@ -19,20 +19,16 @@ class Kernel extends ConsoleKernel
         // 每日更新最新模块
         $schedule->command('template_label')->dailyAt('01:00')->withoutOverlapping(1);//最新模块
         $schedule->command('popular_template_label')->dailyAt('01:30')->withoutOverlapping(1);//热门模块
-        // $schedule->command('inspire')->hourly();
         $schedule->command('rank_data_task')->everyMinute()->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); // 特殊引流
         $schedule->command('sync_channel')->dailyAt('06:00')->withoutOverlapping(1); // 渠道信息，每天执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
-//        $schedule->command('domain_info')->dailyAt('01:20')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
         $schedule->command('share_user')->dailyAt('01:20')->withoutOverlapping(1);// 每天凌晨1点执行一次
         $schedule->command('last_inquiry')->dailyAt('04:00')->withoutOverlapping(1);// 最近一次询盘信息
         $schedule->command('update_seo_tdk_crontab')->dailyAt('20:00')->withoutOverlapping(1); //更新上线项目TDK
         $schedule->command('sync_manager')->dailyAt('01:00')->withoutOverlapping(1); //TODO::手机号码同步  每天执行一次
         $schedule->command('update_keyword_route')->dailyAt('01:00')->withoutOverlapping(1); //升级项目--清除路由相同的关键字
-        $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
+//        $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         $schedule->command('update_keyword_content')->hourly()->withoutOverlapping(1);
         // 每日推送已完成视频任务项目生成对应界面
         //更新AI站点数据
@@ -41,9 +37,6 @@ class Kernel extends ConsoleKernel
         $schedule->command('sync_inquiry_text')->dailyAt('09:00')->withoutOverlapping(1);
         //FB询盘费用同步
         $schedule->command('sync_ad_cost')->everyThirtyMinutes()->withoutOverlapping(1);
-
-//        $schedule->command('ai_blog_auto_publish auto_open')->everyMinute()->withoutOverlapping(1);
-//        $schedule->command('ai_blog_auto_publish auto_publish')->dailyAt('07:00')->withoutOverlapping(1);
     }
 
     /**

@@ -136,6 +136,9 @@ class ProductController extends BaseController
             'id.required' => 'ID不能为空'
         ]);
         $info = $product->read(['id'=>$this->param['id']]);
+        if($info === false){
+            $this->fail('当前数据不存在，或已被删除');
+        }
         $info = $this->handleParam($info);
         return $this->response('success',Code::SUCCESS,$info);
     }