Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -20,14 +20,14 @@ class Kernel extends ConsoleKernel
         $schedule->command('template_label')->dailyAt('01:00')->withoutOverlapping(1);//最新模块
         $schedule->command('template_label')->dailyAt('01:00')->withoutOverlapping(1);//最新模块
         $schedule->command('popular_template_label')->dailyAt('01:30')->withoutOverlapping(1);//热门模块
         $schedule->command('popular_template_label')->dailyAt('01:30')->withoutOverlapping(1);//热门模块
         // $schedule->command('inspire')->hourly();
         // $schedule->command('inspire')->hourly();
-        $schedule->command('remain_day')->dailyAt('09:30')->withoutOverlapping(1); // 项目剩余服务时长
+//        $schedule->command('remain_day')->dailyAt('09:30')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('service_count')->dailyAt('01:00')->withoutOverlapping(1); //服务器使用情况，每天凌晨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('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('sync_channel')->dailyAt('06:00')->withoutOverlapping(1); // 渠道信息，每天执行一次
         $schedule->command('forward_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计转发询盘记录
         $schedule->command('forward_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计转发询盘记录
-        $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
+//        $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
 //        $schedule->command('domain_info')->dailyAt('01:20')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
 //        $schedule->command('domain_info')->dailyAt('01:20')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
         $schedule->command('share_user')->dailyAt('01:20')->withoutOverlapping(1);// 每天凌晨1点执行一次
         $schedule->command('share_user')->dailyAt('01:20')->withoutOverlapping(1);// 每天凌晨1点执行一次

@@ -36,13 +36,13 @@ class AdsController extends BaseController
     {
     {
         $ads_id = trim($request->input('ads_id'));
         $ads_id = trim($request->input('ads_id'));
         $industry = trim($request->input('industry'));
         $industry = trim($request->input('industry'));
-        $result = ReInquiryTask::where(['status' => ReInquiryTask::STATUS_OPEN])
-            ->when($ads_id, function ($query, $ads_id) {
+        $result = ReInquiryTask::when($ads_id, function ($query, $ads_id) {
                 return $query->where('ad_id', 'like', '%' . $ads_id . '%');
                 return $query->where('ad_id', 'like', '%' . $ads_id . '%');
             })
             })
             ->when($industry, function ($query, $industry) {
             ->when($industry, function ($query, $industry) {
                 return $query->where('industry', $industry);
                 return $query->where('industry', $industry);
             })
             })
+//            ->where(['status' => ReInquiryTask::STATUS_OPEN])
             ->orderBy('id', 'desc')
             ->orderBy('id', 'desc')
             ->paginate();
             ->paginate();