周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 31072ce09d25b9aa4562f3a691f09d8324deb871 1 个父辈 57df3b1b

gx

内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 9 行删除
@@ -337,6 +337,7 @@ class ProjectLogic extends BaseLogic @@ -337,6 +337,7 @@ class ProjectLogic extends BaseLogic
337 if(empty($zh)){ 337 if(empty($zh)){
338 continue; 338 continue;
339 } 339 }
  340 + //获取小语种达标天数
340 $result['language'] = $zh['chinese']; 341 $result['language'] = $zh['chinese'];
341 $result['lang'] = $v['lang']; 342 $result['lang'] = $v['lang'];
342 $result['created_at'] = date('Y-m-d H:i:s'); 343 $result['created_at'] = date('Y-m-d H:i:s');
@@ -92,10 +92,11 @@ class RankDataLogic extends BaseLogic @@ -92,10 +92,11 @@ class RankDataLogic extends BaseLogic
92 $data['langs'][$lang['language'] ?? ''] = [ 92 $data['langs'][$lang['language'] ?? ''] = [
93 'lang_text' => $lang['language'], 93 'lang_text' => $lang['language'],
94 'keyword_num' => $lang['keywords'] ?? 0, 94 'keyword_num' => $lang['keywords'] ?? 0,
95 - 'reach_day' => $lang_data[$lang['language']]['dabiao_day'] ?? 0,  
96 - 'home_cnt' => $lang_data[$lang['language']]['home_cnt'] ?? 0, 95 + 'reach_day' => $lang_data[$lang['lang']]['dabiao_day'] ?? 0,
  96 + 'home_cnt' => $lang_data[$lang['lang']]['home_cnt'] ?? 0,
97 'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day, 97 'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day,
98 'type' => $lang['type'] ?? 0, //1 项目关键词 项目天数 2 保证首页关键词 项目达标天数 98 'type' => $lang['type'] ?? 0, //1 项目关键词 项目天数 2 保证首页关键词 项目达标天数
  99 + 'service_day' => $lang['service_day'] ?? 0, //1 项目关键词 项目天数 2 保证首页关键词 项目达标天数
99 ]; 100 ];
100 } 101 }
101 } 102 }
@@ -463,8 +464,6 @@ class RankDataLogic extends BaseLogic @@ -463,8 +464,6 @@ class RankDataLogic extends BaseLogic
463 $first_ten_pages_num ++; 464 $first_ten_pages_num ++;
464 } 465 }
465 } 466 }
466 -  
467 -  
468 $where = [ 467 $where = [
469 'project_id' => $project_id, 468 'project_id' => $project_id,
470 'lang' => $lang 469 'lang' => $lang
@@ -473,13 +472,11 @@ class RankDataLogic extends BaseLogic @@ -473,13 +472,11 @@ class RankDataLogic extends BaseLogic
473 if(!$model){ 472 if(!$model){
474 $model = new RankData(); 473 $model = new RankData();
475 } 474 }
476 -  
477 //关键词达标天数 475 //关键词达标天数
478 //保证关键词数 476 //保证关键词数
479 $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num'); 477 $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
480 $type = Project::where('id', $project_id)->value('type'); 478 $type = Project::where('id', $project_id)->value('type');
481 $model->is_compliance = 0; 479 $model->is_compliance = 0;
482 -  
483 //是否达标 480 //是否达标
484 $is_compliance = $first_page_num >= $keyword_num; 481 $is_compliance = $first_page_num >= $keyword_num;
485 if(in_array($project_id, $without_extension_project_ids)){ 482 if(in_array($project_id, $without_extension_project_ids)){
@@ -487,20 +484,17 @@ class RankDataLogic extends BaseLogic @@ -487,20 +484,17 @@ class RankDataLogic extends BaseLogic
487 } 484 }
488 if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) { 485 if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) {
489 Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num); 486 Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num);
490 -  
491 //项目表更新 487 //项目表更新
492 if (($model->updated_date != date('Y-m-d') || empty($model->is_compliance)) && !$lang) { 488 if (($model->updated_date != date('Y-m-d') || empty($model->is_compliance)) && !$lang) {
493 $compliance_day = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0; 489 $compliance_day = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0;
494 Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]); 490 Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
495 Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1：'. ($compliance_day + 1)); 491 Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1：'. ($compliance_day + 1));
496 } 492 }
497 -  
498 $model->compliance_day = $model->compliance_day + 1; 493 $model->compliance_day = $model->compliance_day + 1;
499 $model->is_compliance = 1; 494 $model->is_compliance = 1;
500 } else { 495 } else {
501 Log::channel('rank_data')->info('项目' . $project_id . ':关键词未达标'. $keyword_num .' - ' . $first_page_num); 496 Log::channel('rank_data')->info('项目' . $project_id . ':关键词未达标'. $keyword_num .' - ' . $first_page_num);
502 } 497 }
503 -  
504 $model->project_id = $project_id; 498 $model->project_id = $project_id;
505 $model->first_num = $first_num; 499 $model->first_num = $first_num;
506 $model->first_page_num = $first_page_num; 500 $model->first_page_num = $first_page_num;