正在显示
1 个修改的文件
包含
8 行增加
和
1 行删除
| @@ -493,7 +493,12 @@ class RelayInquiry extends Command | @@ -493,7 +493,12 @@ class RelayInquiry extends Command | ||
| 493 | $country_name = $ip_data->ip_area; | 493 | $country_name = $ip_data->ip_area; |
| 494 | 494 | ||
| 495 | //message | 495 | //message |
| 496 | + $message = ''; | ||
| 497 | + $message_id = 0; | ||
| 498 | + $msg_lang = ''; | ||
| 499 | + if($is_inquiry) { | ||
| 496 | list($message, $message_id, $msg_lang) = $this->getMessage($task, $form->message, $domain, $inquiry_product_url); | 500 | list($message, $message_id, $msg_lang) = $this->getMessage($task, $form->message, $domain, $inquiry_product_url); |
| 501 | + } | ||
| 497 | $lang = $lang ?: $msg_lang; | 502 | $lang = $lang ?: $msg_lang; |
| 498 | 503 | ||
| 499 | $this->output('获取转发设备信息'); | 504 | $this->output('获取转发设备信息'); |
| @@ -506,15 +511,17 @@ class RelayInquiry extends Command | @@ -506,15 +511,17 @@ class RelayInquiry extends Command | ||
| 506 | $pre = 0; | 511 | $pre = 0; |
| 507 | $start_time = time(); | 512 | $start_time = time(); |
| 508 | $seconds = rand(300, 7200); // 开始时间 从5-2小时后开始 | 513 | $seconds = rand(300, 7200); // 开始时间 从5-2小时后开始 |
| 514 | + $email = ''; | ||
| 509 | if($is_inquiry) { | 515 | if($is_inquiry) { |
| 510 | $exists = ReInquiryDetail::where('re_website', $domain)->where('email', $form->email)->first(); | 516 | $exists = ReInquiryDetail::where('re_website', $domain)->where('email', $form->email)->first(); |
| 511 | if ($exists) { | 517 | if ($exists) { |
| 512 | $this->output('转发站点邮件已存在'); | 518 | $this->output('转发站点邮件已存在'); |
| 513 | continue; | 519 | continue; |
| 514 | } | 520 | } |
| 521 | + $email = $form->email; | ||
| 515 | } | 522 | } |
| 516 | // 写入推送详情 | 523 | // 写入推送详情 |
| 517 | - $re_detail = ReInquiryDetail::createInquiry($task['id'], $form->id, $domain, $country_name, $ip, $form->full_name, $form->email, $phone, $message, $message_id, $device_port, | 524 | + $re_detail = ReInquiryDetail::createInquiry($task['id'], $form->id, $domain, $country_name, $ip, $form->full_name, $email, $phone, $message, $message_id, $device_port, |
| 518 | $user_agent, $referrer, $urls, $is_v6, date('Y-m-d H:i:s', $start_time + $seconds)); | 525 | $user_agent, $referrer, $urls, $is_v6, date('Y-m-d H:i:s', $start_time + $seconds)); |
| 519 | foreach ($urls as $k=>$v){ | 526 | foreach ($urls as $k=>$v){ |
| 520 | $pre++; | 527 | $pre++; |
-
请 注册 或 登录 后发表评论