gx

@@ -337,6 +337,7 @@ class ProjectLogic extends BaseLogic
                     if(empty($zh)){
                         continue;
                     }
+                    //获取小语种达标天数
                     $result['language'] = $zh['chinese'];
                     $result['lang'] = $v['lang'];
                     $result['created_at'] = date('Y-m-d H:i:s');

@@ -92,10 +92,11 @@ class RankDataLogic extends BaseLogic
                 $data['langs'][$lang['language'] ?? ''] = [
                     'lang_text' => $lang['language'],
                     'keyword_num' => $lang['keywords'] ?? 0,
-                    'reach_day' => $lang_data[$lang['language']]['dabiao_day'] ?? 0,
-                    'home_cnt' => $lang_data[$lang['language']]['home_cnt'] ?? 0,
+                    'reach_day' => $lang_data[$lang['lang']]['dabiao_day'] ?? 0,
+                    'home_cnt' => $lang_data[$lang['lang']]['home_cnt'] ?? 0,
                     'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day,
                     'type' => $lang['type'] ?? 0, //1 项目关键词 项目天数  2 保证首页关键词 项目达标天数
+                    'service_day' => $lang['service_day'] ?? 0, //1 项目关键词 项目天数  2 保证首页关键词 项目达标天数
                 ];
             }
         }
@@ -463,8 +464,6 @@ class RankDataLogic extends BaseLogic
                 $first_ten_pages_num ++;
             }
         }
-
-
         $where = [
             'project_id' => $project_id,
             'lang' => $lang
@@ -473,13 +472,11 @@ class RankDataLogic extends BaseLogic
         if(!$model){
             $model = new RankData();
         }
-
         //关键词达标天数
         //保证关键词数
         $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
         $type = Project::where('id', $project_id)->value('type');
         $model->is_compliance = 0;
-
         //是否达标
         $is_compliance = $first_page_num >= $keyword_num;
         if(in_array($project_id, $without_extension_project_ids)){
@@ -487,20 +484,17 @@ class RankDataLogic extends BaseLogic
         }
         if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) {
             Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num);
-
             //项目表更新
             if (($model->updated_date != date('Y-m-d') || empty($model->is_compliance)) && !$lang) {
                 $compliance_day = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0;
                 Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
                 Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1：'. ($compliance_day + 1));
             }
-
             $model->compliance_day = $model->compliance_day + 1;
             $model->is_compliance = 1;
         } else {
             Log::channel('rank_data')->info('项目' . $project_id . ':关键词未达标'. $keyword_num .' - ' . $first_page_num);
         }
-
         $model->project_id = $project_id;
         $model->first_num = $first_num;
         $model->first_page_num = $first_page_num;