周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 7a4a0aa8334b1cd2070640f2cc18e5cedc03d337 2 个父辈 c49b562d a3e0593c

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 14 行增加 和 16 行删除
@@ -54,12 +54,13 @@ class WeekProject extends Command @@ -54,12 +54,13 @@ 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,'type'=>['in',[1,2,3,4,6]]],'id',['id','title']); 57 + $list = $projectModel->list(['delete_status'=>0,'id'=>['<',2000],'type'=>['in',[1,2,3,4,6]]],'id',['id','title']);
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;
61 $domainInfo = $domainModel->read(['project_id'=>$v['id']]); 61 $domainInfo = $domainModel->read(['project_id'=>$v['id']]);
62 if($domainInfo === false){ 62 if($domainInfo === false){
  63 + echo date('Y-m-d H:i:s') . '域名不存在，跳过：'.$v['title'] . PHP_EOL;
63 continue; 64 continue;
64 } 65 }
65 $v['domain'] = $domainInfo['domain']; 66 $v['domain'] = $domainInfo['domain'];
@@ -93,11 +94,17 @@ class WeekProject extends Command @@ -93,11 +94,17 @@ class WeekProject extends Command
93 $countModel = new Count(); 94 $countModel = new Count();
94 $startOfThisWeek = date('Y-m-d', strtotime("monday this week")); 95 $startOfThisWeek = date('Y-m-d', strtotime("monday this week"));
95 $endOfLastWeekFormattedInfo = $countModel->read(['date'=>$startOfThisWeek,'project_id'=>$value['id']],['inquiry_num','country']); 96 $endOfLastWeekFormattedInfo = $countModel->read(['date'=>$startOfThisWeek,'project_id'=>$value['id']],['inquiry_num','country']);
96 - $data['inquiry_total'] = $endOfLastWeekFormattedInfo['inquiry_num'] ?? 0;//询盘数量  
97 - $data['inquiry_country'] = $endOfLastWeekFormattedInfo['country'] ?? json_encode([]); 97 + $data['inquiry_total'] = $endOfLastWeekFormattedInfo['inquiry_num'] ?? 0;//询盘总数量
  98 + $data['inquiry_country'] = $endOfLastWeekFormattedInfo['country'] ?? json_encode([]);//询盘国家
98 //获取上一周询盘数量 99 //获取上一周询盘数量
99 $result = (new FormGlobalsoApi())->getDateInquiry($value['domain'],$data['start_date'],$data['end_date']); 100 $result = (new FormGlobalsoApi())->getDateInquiry($value['domain'],$data['start_date'],$data['end_date']);
100 - $data['week_inquiry_total'] = ($endOfLastWeekFormattedInfo['inquiry_num'] ?? 0) - ($startOfLastWeekFormattedInfo['inquiry_num'] ?? 0); 101 + if(isset($result['status'])){
  102 + $data['week_inquiry_total'] = $result['data'];
  103 + echo date('Y-m-d H:i:s') . '项目id：'.$value['id'].',域名：'.$value['domain'].',上周询盘数量data:'.$result['data'] . PHP_EOL;
  104 + }else{
  105 + $data['week_inquiry_total'] = 0;
  106 + echo date('Y-m-d H:i:s') . '项目id：'.$value['id'].',域名：'.$value['domain'].',请求询盘错误。' . PHP_EOL;
  107 + }
101 $rankDataModel = new RankData(); 108 $rankDataModel = new RankData();
102 $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']); 109 $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']);
103 $data['google_indexed_num'] = $rankInfo['indexed_pages_num'] ?? 0; 110 $data['google_indexed_num'] = $rankInfo['indexed_pages_num'] ?? 0;
@@ -124,13 +131,12 @@ class WeekProject extends Command @@ -124,13 +131,12 @@ class WeekProject extends Command
124 //日均访问量 131 //日均访问量
125 $data['daily_average_num'] = 0; 132 $data['daily_average_num'] = 0;
126 $pv_num_count = $countModel->where('project_id',$value['id'])->whereBetween('date', [$startOfLastWeekFormatted,$endOfLastWeekFormatted])->sum('pv_num'); 133 $pv_num_count = $countModel->where('project_id',$value['id'])->whereBetween('date', [$startOfLastWeekFormatted,$endOfLastWeekFormatted])->sum('pv_num');
127 - echo date('Y-m-d H:i:s') . 'pv总量:'.$pv_num_count . PHP_EOL;  
128 if($pv_num_count != 0){ 134 if($pv_num_count != 0){
129 $data['daily_average_num'] = round($pv_num_count / 7,2); 135 $data['daily_average_num'] = round($pv_num_count / 7,2);
130 } 136 }
131 $v6WeeklyReportModel = new V6WeeklyReport(); 137 $v6WeeklyReportModel = new V6WeeklyReport();
132 $v6WeeklyReportModel->add($data); 138 $v6WeeklyReportModel->add($data);
133 - $this->workChatMessage($data,$value['id']); 139 +// $this->workChatMessage($data,$value['id']);
134 return true; 140 return true;
135 } 141 }
136 142
@@ -246,6 +252,7 @@ class WeekProject extends Command @@ -246,6 +252,7 @@ class WeekProject extends Command
246 $content4 .= '聚合页小语种站页面'.$data['aggregation_minor_update_num'].'次。'; 252 $content4 .= '聚合页小语种站页面'.$data['aggregation_minor_update_num'].'次。';
247 } 253 }
248 $arr[] = $content4; 254 $arr[] = $content4;
  255 + $content = '';
249 foreach ($arr as $key => $val){ 256 foreach ($arr as $key => $val){
250 $content .= ($key + 1) .','.$val.PHP_EOL; 257 $content .= ($key + 1) .','.$val.PHP_EOL;
251 } 258 }
@@ -209,7 +209,6 @@ class FormGlobalsoApi @@ -209,7 +209,6 @@ class FormGlobalsoApi
209 $queryString = http_build_query($data); 209 $queryString = http_build_query($data);
210 $url = 'https://www.globalso.site/api/external-interface/country_con/15243d63ed5a5738?'.$queryString; 210 $url = 'https://www.globalso.site/api/external-interface/country_con/15243d63ed5a5738?'.$queryString;
211 $res = http_get($url,['charset=utf-8']); 211 $res = http_get($url,['charset=utf-8']);
212 - echo date('Y-m-d H:i:s') . '数据：'.json_encode($res) . PHP_EOL;  
213 return $res; 212 return $res;
214 } 213 }
215 214
@@ -234,7 +233,6 @@ class FormGlobalsoApi @@ -234,7 +233,6 @@ class FormGlobalsoApi
234 $queryString = http_build_query($data); 233 $queryString = http_build_query($data);
235 $url = 'https://www.globalso.site/api/external-interface/date_count?'.$queryString; 234 $url = 'https://www.globalso.site/api/external-interface/date_count?'.$queryString;
236 $res = http_get($url,['charset=utf-8']); 235 $res = http_get($url,['charset=utf-8']);
237 - echo date('Y-m-d H:i:s') . '数据：'.json_encode($res) . PHP_EOL;  
238 return $res; 236 return $res;
239 } 237 }
240 } 238 }
@@ -40,15 +40,8 @@ class TestController extends BaseController @@ -40,15 +40,8 @@ class TestController extends BaseController
40 * @time :2025/2/13 16:34 40 * @time :2025/2/13 16:34
41 */ 41 */
42 public function ceshi(){ 42 public function ceshi(){
43 - // 上一周的开始时间（周一 00:00:00）  
44 - $startOfLastWeek = strtotime("last week monday");  
45 - // 上一周的结束时间（周日 23:59:59）  
46 - $endOfLastWeek = strtotime("last week sunday 23:59:59");  
47 - // 格式化为日期时间字符串  
48 - $data['start_date'] = $startOfLastWeekFormatted = date('Y-m-d', $startOfLastWeek);  
49 - $data['end_date'] = $endOfLastWeekFormatted = date('Y-m-d', $endOfLastWeek);  
50 //获取上一周询盘数量 43 //获取上一周询盘数量
51 - $result = (new FormGlobalsoApi())->getDateInquiry('www.rzalubottle.com',$data['start_date'],$data['end_date']); 44 + $result = (new FormGlobalsoApi())->getDateInquiry($this->param['domain'],$this->param['start'],$this->param['end']);
52 $this->response('success',Code::SUCCESS,$result); 45 $this->response('success',Code::SUCCESS,$result);
53 } 46 }
54 } 47 }