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

@@ -997,13 +997,13 @@ class RelayInquiry extends Command
                 $res = $this->get_rand([$task->second_push_rate, 100 - $task->second_push_rate]);
                 $res = $this->get_rand([$task->second_push_rate, 100 - $task->second_push_rate]);
                 if($res == 1){
                 if($res == 1){
                     //随机分配到未投放广告日期
                     //随机分配到未投放广告日期
-                    $now = Carbon::now();
+                    $now = time();
                     // 随机开始时间（本周四或现在）
                     // 随机开始时间（本周四或现在）
-                    $startTime = max($now->timestamp, $now->startOfWeek(4)->timestamp);
+                    $startTime = max($now, strtotime('this thursday'));
 
 
-                    $random = mt_rand($startTime, $now->endOfWeek()->timestamp);
+                    $random = mt_rand($startTime, strtotime('next monday'));
 
 
-                    $delay = $random - time();
+                    $delay = $random - $now;
                     $this->output('非广告投放日第一封询盘 概率' . (100 - $task->second_push_rate) . '%延迟推送' . $delay);
                     $this->output('非广告投放日第一封询盘 概率' . (100 - $task->second_push_rate) . '%延迟推送' . $delay);
                     return $delay;
                     return $delay;
                 }
                 }

@@ -145,6 +145,7 @@ class SyncInquiryProject extends Command
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->where('gl_project.type', Project::TYPE_TWO)
             ->where('gl_project.type', Project::TYPE_TWO)
             ->where('gl_project.extend_type', '!=', 5)
             ->where('gl_project.extend_type', '!=', 5)
+            ->where('gl_project.delete_status', Project::IS_DEL_FALSE)
             ->where(function ($query) {
             ->where(function ($query) {
                 $query->orwhere('gl_project_online_check.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
                 $query->orwhere('gl_project_online_check.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
                     ->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
                     ->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);