周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 dc236f2ba644f01a7294e62aef794705e9579a8a 1 个父辈 3700bd0a

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 15 行增加 和 9 行删除
@@ -61,8 +61,8 @@ class SyncInquiryProject extends Command @@ -61,8 +61,8 @@ class SyncInquiryProject extends Command
61 */ 61 */
62 public function handle() 62 public function handle()
63 { 63 {
64 - $this->output('开始同步v5');  
65 - $this->syncGloV5(); 64 +// $this->output('开始同步v5');
  65 +// $this->syncGloV5();
66 $this->output('开始同步v6'); 66 $this->output('开始同步v6');
67 $this->syncGloV6(); 67 $this->syncGloV6();
68 return true; 68 return true;
@@ -107,7 +107,7 @@ class SyncInquiryProject extends Command @@ -107,7 +107,7 @@ class SyncInquiryProject extends Command
107 } 107 }
108 108
109 // 保存项目 以及 获取路由信息 109 // 保存项目 以及 获取路由信息
110 - $project = InquiryProject::saveProject($date, $val['v'], $val['postid'], $val['company'], implode(',', $channel_tmp), $val['main_url'], $recent_inquiry, $val['is_split'], $val['test_url']); 110 + $project = InquiryProject::saveProject($date, $val['v'], $val['postid'], $val['company'], implode(',', $channel_tmp), $val['main_url'], $recent_inquiry, '', $val['is_split'], $val['test_url']);
111 $route_domain = $val['is_split'] && $val['test_url'] ? $val['test_url'] : $val['main_url']; 111 $route_domain = $val['is_split'] && $val['test_url'] ? $val['test_url'] : $val['main_url'];
112 try { 112 try {
113 $result = http_get($route_domain . 'k_u_api.php'); 113 $result = http_get($route_domain . 'k_u_api.php');
@@ -140,13 +140,14 @@ class SyncInquiryProject extends Command @@ -140,13 +140,14 @@ class SyncInquiryProject extends Command
140 $last_week_time = date('Y-m-d H:i:s', strtotime('-1 week')); 140 $last_week_time = date('Y-m-d H:i:s', strtotime('-1 week'));
141 // 获取优化中台项目 141 // 获取优化中台项目
142 $project = Project::leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id') 142 $project = Project::leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
  143 + ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
143 ->where('gl_project.type', Project::TYPE_TWO) 144 ->where('gl_project.type', Project::TYPE_TWO)
144 ->where('gl_project.extend_type', '!=', 5) 145 ->where('gl_project.extend_type', '!=', 5)
145 ->where(function ($query) { 146 ->where(function ($query) {
146 $query->orwhere('gl_project_online_check.qa_status', OnlineCheck::STATUS_ONLINE_TRUE) 147 $query->orwhere('gl_project_online_check.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
147 ->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE); 148 ->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
148 }) 149 })
149 - ->get(['gl_project.id', 'gl_project.title', 'gl_project.level', 'gl_project.channel', 'gl_project.is_upgrade']); 150 + ->get(['gl_project.id', 'gl_project.title', 'gl_project.level', 'gl_project.channel', 'gl_project_deploy_optimize.inquiry_prompt']);
150 // 获取所有项目域名 151 // 获取所有项目域名
151 $domains = DomainInfo::whereIn('project_id', $project->pluck('id')->toArray())->pluck('domain', 'project_id')->toArray(); 152 $domains = DomainInfo::whereIn('project_id', $project->pluck('id')->toArray())->pluck('domain', 'project_id')->toArray();
152 $form_api = new FormGlobalsoApi(); 153 $form_api = new FormGlobalsoApi();
@@ -157,13 +158,13 @@ class SyncInquiryProject extends Command @@ -157,13 +158,13 @@ class SyncInquiryProject extends Command
157 continue; 158 continue;
158 159
159 $domain = $domains[$val->id] ?? ''; 160 $domain = $domains[$val->id] ?? '';
160 - if(!$domain){ 161 + if (!$domain) {
161 continue; 162 continue;
162 } 163 }
163 164
164 //判断项目7天之内是否有询盘 165 //判断项目7天之内是否有询盘
165 $recent_inquiry = 0; 166 $recent_inquiry = 0;
166 - $inquiry_list = $form_api->getInquiryList('https://' . $domain . '/', $val->is_upgrade); 167 + $inquiry_list = $form_api->getInquiryList('https://' . $domain . '/');
167 $last_inquiry_time = $inquiry_list['data']['data'][0]['submit_time'] ?? ''; 168 $last_inquiry_time = $inquiry_list['data']['data'][0]['submit_time'] ?? '';
168 if ($last_inquiry_time > $last_week_time) { 169 if ($last_inquiry_time > $last_week_time) {
169 $recent_inquiry = 1; 170 $recent_inquiry = 1;
@@ -177,8 +178,8 @@ class SyncInquiryProject extends Command @@ -177,8 +178,8 @@ class SyncInquiryProject extends Command
177 DB::disconnect('custom_mysql'); 178 DB::disconnect('custom_mysql');
178 } 179 }
179 180
180 - $project = InquiryProject::saveProject($date, InquiryProject::VERSION_SIX, $val->id, $val->title, $val->channel['channel_id'], 'https://' . $domain . '/', $recent_inquiry);  
181 - $this->pushTask($project->id); 181 + $project = InquiryProject::saveProject($date, InquiryProject::VERSION_SIX, $val->id, $val->title, $val->channel['channel_id'], 'https://' . $domain . '/', $recent_inquiry, $val->inquiry_prompt ?? '');
  182 +// $this->pushTask($project->id);
182 } 183 }
183 184
184 $ids = InquiryProject::where('date', '<', $date)->where('version', '=', InquiryProject::VERSION_SIX)->pluck('id')->toArray(); 185 $ids = InquiryProject::where('date', '<', $date)->where('version', '=', InquiryProject::VERSION_SIX)->pluck('id')->toArray();
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 * Date: 2025/2/17 5 * Date: 2025/2/17
6 * Time: 11:49 6 * Time: 11:49
7 */ 7 */
  8 +
8 namespace App\Models\Inquiry; 9 namespace App\Models\Inquiry;
9 10
10 use App\Models\Base; 11 use App\Models\Base;
@@ -34,16 +35,20 @@ class InquiryProject extends Base @@ -34,16 +35,20 @@ class InquiryProject extends Base
34 * @param $channel 35 * @param $channel
35 * @param $domain 36 * @param $domain
36 * @param $recent_inquiry 37 * @param $recent_inquiry
  38 + * @param $remark
37 * @param int $is_split 39 * @param int $is_split
38 * @param string $test_domain 40 * @param string $test_domain
39 * @return InquiryProject 41 * @return InquiryProject
40 */ 42 */
41 - public static function saveProject($date, $version, $primary_id, $project, $channel, $domain,$recent_inquiry, $is_split = 0, $test_domain = '') 43 + public static function saveProject($date, $version, $primary_id, $project, $channel, $domain, $recent_inquiry, $remark = '', $is_split = 0, $test_domain = '')
42 { 44 {
43 $log = self::where(compact('version', 'primary_id'))->first(); 45 $log = self::where(compact('version', 'primary_id'))->first();
44 if ($log) { 46 if ($log) {
45 $log->date = $date; 47 $log->date = $date;
  48 + $log->project = $project;
  49 + $log->domain = $domain;
46 $log->recent_inquiry = $recent_inquiry; 50 $log->recent_inquiry = $recent_inquiry;
  51 + $log->remark = $remark;
47 $log->save(); 52 $log->save();
48 return $log; 53 return $log;
49 } 54 }