周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 84ef25339506f84101f365cea0242f8ea895cc03 2 个父辈 b3edbdc8 5a0c86c4

Merge remote-tracking branch 'origin/master' into akun

内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 1 行删除
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 9
10 namespace App\Console\Commands\ProjectWeeklyReport; 10 namespace App\Console\Commands\ProjectWeeklyReport;
11 11
  12 +use App\Models\Blog\Blog;
12 use App\Models\Com\Notify; 13 use App\Models\Com\Notify;
13 use App\Models\Com\V6WeeklyReport; 14 use App\Models\Com\V6WeeklyReport;
14 use App\Models\HomeCount\Count; 15 use App\Models\HomeCount\Count;
@@ -85,7 +86,7 @@ class WeekProject extends Command @@ -85,7 +86,7 @@ class WeekProject extends Command
85 $data['inquiry_country'] = $startOfLastWeekFormattedInfo['country'] ?? json_encode([]); 86 $data['inquiry_country'] = $startOfLastWeekFormattedInfo['country'] ?? json_encode([]);
86 $data['week_inquiry_total'] = ($startOfLastWeekFormattedInfo['inquiry_num'] ?? 0) - ($endOfLastWeekFormattedInfo['inquiry_num'] ?? 0); 87 $data['week_inquiry_total'] = ($startOfLastWeekFormattedInfo['inquiry_num'] ?? 0) - ($endOfLastWeekFormattedInfo['inquiry_num'] ?? 0);
87 $rankDataModel = new RankData(); 88 $rankDataModel = new RankData();
88 - $rankInfo = $rankDataModel->read(['project_id'=>$value['id']],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']); 89 + $rankInfo = $rankDataModel->read(['project_id'=>$value['id'],'lang'=>''],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']);
89 $data['google_indexed_num'] = $rankInfo['indexed_pages_num'] ?? 0; 90 $data['google_indexed_num'] = $rankInfo['indexed_pages_num'] ?? 0;
90 $externalLinksModel = new ExternalLinks(); 91 $externalLinksModel = new ExternalLinks();
91 $linkInfo = $externalLinksModel->read(['project_id'=>$value['id']],['total']); 92 $linkInfo = $externalLinksModel->read(['project_id'=>$value['id']],['total']);
@@ -98,6 +99,8 @@ class WeekProject extends Command @@ -98,6 +99,8 @@ class WeekProject extends Command
98 $data['product_num'] = $productModel->counts(['status'=>1]) ?? 0; 99 $data['product_num'] = $productModel->counts(['status'=>1]) ?? 0;
99 $newsModel = new News(); 100 $newsModel = new News();
100 $data['news_num'] = $newsModel->counts(['status'=>1]) ?? 0; 101 $data['news_num'] = $newsModel->counts(['status'=>1]) ?? 0;
  102 + $blogModel = new Blog();
  103 + $data['blog_num'] = $blogModel->counts(['status'=>1]) ?? 0;
101 $notifyModel = new Notify(); 104 $notifyModel = new Notify();
102 $data['main_update_num'] = $notifyModel->counts(['type'=>1,'route'=>1,'project_id'=>$value['id']]) ?? 0; 105 $data['main_update_num'] = $notifyModel->counts(['type'=>1,'route'=>1,'project_id'=>$value['id']]) ?? 0;
103 $data['aggregation_update_num'] = $notifyModel->counts(['type'=>1,'route'=>4,'project_id'=>$value['id']]) ?? 0; 106 $data['aggregation_update_num'] = $notifyModel->counts(['type'=>1,'route'=>4,'project_id'=>$value['id']]) ?? 0;