周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 bbd6aa1ceeb5284e61593cffd34e24c8398680ed 2 个父辈 e3e510e9 cfc575a8

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 46 行增加 和 11 行删除
@@ -41,7 +41,7 @@ class DownloadProject extends Command @@ -41,7 +41,7 @@ class DownloadProject extends Command
41 41
42 public function handle(){ 42 public function handle(){
43 $v6WeekModel = new V6WeeklyReport(); 43 $v6WeekModel = new V6WeeklyReport();
44 - $lists = $v6WeekModel->list([],'id',['*'],'desc',100); 44 + $lists = $v6WeekModel->list([],'id',['*'],'desc',2);
45 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL; 45 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
46 foreach ($lists as $data){ 46 foreach ($lists as $data){
47 $this->workChatMessage($data,$data['project_id']); 47 $this->workChatMessage($data,$data['project_id']);
@@ -209,6 +209,7 @@ class DownloadProject extends Command @@ -209,6 +209,7 @@ class DownloadProject extends Command
209 // } 209 // }
210 210
211 public function workChatMessage($data,$project_id){ 211 public function workChatMessage($data,$project_id){
  212 + $data['main_lang_id'] = 8;
212 $arr = []; 213 $arr = [];
213 $content = ''; 214 $content = '';
214 $content1 = ''; 215 $content1 = '';
@@ -226,7 +227,9 @@ class DownloadProject extends Command @@ -226,7 +227,9 @@ class DownloadProject extends Command
226 $country .= $k.','; 227 $country .= $k.',';
227 }; 228 };
228 $country = trim($country,','); 229 $country = trim($country,',');
229 - $content1 .= '询盘主要来源于'.$country.'等国家地区'; 230 + if(!empty($country)){
  231 + $content1 .= '询盘主要来源于'.$country.'等国家地区';
  232 + }
230 } 233 }
231 $content1 .= '如有高质量客户，请您密切关注与跟进;'; 234 $content1 .= '如有高质量客户，请您密切关注与跟进;';
232 } 235 }
@@ -236,14 +239,27 @@ class DownloadProject extends Command @@ -236,14 +239,27 @@ class DownloadProject extends Command
236 $content2 = ''; 239 $content2 = '';
237 if(!empty($data['google_indexed_num']) || !empty($data['google_links_num']) || !empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num']) || !empty($data['daily_average_num'])){ 240 if(!empty($data['google_indexed_num']) || !empty($data['google_links_num']) || !empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num']) || !empty($data['daily_average_num'])){
238 $content2 .= '项目截止目前'; 241 $content2 .= '项目截止目前';
  242 + if($data['main_lang_id'] == 8){
  243 + $title = 'Yandex';
  244 + }else{
  245 + $title = '谷歌';
  246 + }
239 if(!empty($data['google_indexed_num'])){ 247 if(!empty($data['google_indexed_num'])){
240 - $content2 .= '谷歌收录量：'.$data['google_indexed_num'].'条，'; 248 + $content2 .= $title.'收录量：'.$data['google_indexed_num'].'条，';
241 } 249 }
242 if(!empty($data['google_links_num'])){ 250 if(!empty($data['google_links_num'])){
243 - $content2 .= '外链量：'.$data['google_links_num'].'条，'; 251 + //获取上一次的外链数
  252 + $latestRecord = V6WeeklyReport::where(['project_id'=>$project_id])->orderBy('id', 'desc')->first();
  253 + if(!empty($latestRecord)){
  254 + if($latestRecord['google_links_num'] != $data['google_links_num']){
  255 + $content2 .= '外链量：'.$data['google_links_num'].'条，';
  256 + }
  257 + }else{
  258 + $content2 .= '外链量：'.$data['google_links_num'].'条，';
  259 + }
244 } 260 }
245 if(!empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num'])){ 261 if(!empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num'])){
246 - $content2 .= '谷歌搜索排名'; 262 + $content2 .= $title.'搜索排名';
247 if(!empty($data['keyword_home_num'])){ 263 if(!empty($data['keyword_home_num'])){
248 $content2 .= '首页关键词数量为：'.$data['keyword_home_num'].'个，'; 264 $content2 .= '首页关键词数量为：'.$data['keyword_home_num'].'个，';
249 } 265 }
@@ -54,7 +54,7 @@ class WeekProject extends Command @@ -54,7 +54,7 @@ class WeekProject extends Command
54 */ 54 */
55 public function handle(){ 55 public function handle(){
56 $projectModel = new Project(); 56 $projectModel = new Project();
57 - $list = $projectModel->list(['delete_status'=>0,'is_weekly_report'=>1,'type'=>['in',[1,2,3,4,6]]],'id',['id','title']); 57 + $list = $projectModel->list(['delete_status'=>0,'type'=>['in',[1,2,3,4,6]]],'id',['id','title','is_weekly_report','main_lang_id']);
58 $domainModel = new DomainInfo(); 58 $domainModel = new DomainInfo();
59 foreach ($list as $k => $v){ 59 foreach ($list as $k => $v){
60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
@@ -83,6 +83,7 @@ class WeekProject extends Command @@ -83,6 +83,7 @@ class WeekProject extends Command
83 $data = [ 83 $data = [
84 'project_id'=>$value['id'], 84 'project_id'=>$value['id'],
85 'title'=>$value['title'], 85 'title'=>$value['title'],
  86 + 'main_lang_id'=>$value['main_lang_id'],
86 ]; 87 ];
87 // 上一周的开始时间（周一 00:00:00） 88 // 上一周的开始时间（周一 00:00:00）
88 $startOfLastWeek = strtotime("last week monday"); 89 $startOfLastWeek = strtotime("last week monday");
@@ -134,9 +135,12 @@ class WeekProject extends Command @@ -134,9 +135,12 @@ class WeekProject extends Command
134 if($pv_num_count != 0){ 135 if($pv_num_count != 0){
135 $data['daily_average_num'] = round($pv_num_count / 7,2); 136 $data['daily_average_num'] = round($pv_num_count / 7,2);
136 } 137 }
  138 +
  139 + if($value['is_weekly_report'] != 0){
  140 + $this->workChatMessage($data,$value['id']);
  141 + }
137 $v6WeeklyReportModel = new V6WeeklyReport(); 142 $v6WeeklyReportModel = new V6WeeklyReport();
138 $v6WeeklyReportModel->add($data); 143 $v6WeeklyReportModel->add($data);
139 - $this->workChatMessage($data,$value['id']);  
140 return true; 144 return true;
141 } 145 }
142 146
@@ -174,7 +178,9 @@ class WeekProject extends Command @@ -174,7 +178,9 @@ class WeekProject extends Command
174 $country .= $k.','; 178 $country .= $k.',';
175 }; 179 };
176 $country = trim($country,','); 180 $country = trim($country,',');
177 - $content1 .= '询盘主要来源于'.$country.'等国家地区'; 181 + if(!empty($country)){
  182 + $content1 .= '询盘主要来源于'.$country.'等国家地区';
  183 + }
178 } 184 }
179 $content1 .= '如有高质量客户，请您密切关注与跟进;'; 185 $content1 .= '如有高质量客户，请您密切关注与跟进;';
180 } 186 }
@@ -184,14 +190,27 @@ class WeekProject extends Command @@ -184,14 +190,27 @@ class WeekProject extends Command
184 $content2 = ''; 190 $content2 = '';
185 if(!empty($data['google_indexed_num']) || !empty($data['google_links_num']) || !empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num']) || !empty($data['daily_average_num'])){ 191 if(!empty($data['google_indexed_num']) || !empty($data['google_links_num']) || !empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num']) || !empty($data['daily_average_num'])){
186 $content2 .= '项目截止目前'; 192 $content2 .= '项目截止目前';
  193 + if($data['main_lang_id'] == 8){
  194 + $title = 'Yandex';
  195 + }else{
  196 + $title = '谷歌';
  197 + }
187 if(!empty($data['google_indexed_num'])){ 198 if(!empty($data['google_indexed_num'])){
188 - $content2 .= '谷歌收录量：'.$data['google_indexed_num'].'条，'; 199 + $content2 .= $title.'收录量：'.$data['google_indexed_num'].'条，';
189 } 200 }
190 if(!empty($data['google_links_num'])){ 201 if(!empty($data['google_links_num'])){
191 - $content2 .= '外链量：'.$data['google_links_num'].'条，'; 202 + //获取上一次的外链数
  203 + $latestRecord = V6WeeklyReport::where(['project_id'=>$project_id])->orderBy('id', 'desc')->first();
  204 + if(!empty($latestRecord)){
  205 + if($latestRecord['google_links_num'] != $data['google_links_num']){
  206 + $content2 .= '外链量：'.$data['google_links_num'].'条，';
  207 + }
  208 + }else{
  209 + $content2 .= '外链量：'.$data['google_links_num'].'条，';
  210 + }
192 } 211 }
193 if(!empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num'])){ 212 if(!empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num'])){
194 - $content2 .= '谷歌搜索排名'; 213 + $content2 .= $title.'搜索排名';
195 if(!empty($data['keyword_home_num'])){ 214 if(!empty($data['keyword_home_num'])){
196 $content2 .= '首页关键词数量为：'.$data['keyword_home_num'].'个，'; 215 $content2 .= '首页关键词数量为：'.$data['keyword_home_num'].'个，';
197 } 216 }