作者 刘锟

update

@@ -76,7 +76,13 @@ class InquiryForwardLogic extends BaseLogic @@ -76,7 +76,13 @@ class InquiryForwardLogic extends BaseLogic
76 try { 76 try {
77 $num = 0; 77 $num = 0;
78 $now = date('Y-m-d H:i:s'); 78 $now = date('Y-m-d H:i:s');
79 - foreach ($this->param['forward_url'] as $website) { 79 + foreach ($this->param['forward_url'] as $url) {
  80 + $domain_array = parse_url($url);
  81 + $website = $domain_array['host'] ?? '';
  82 + if (!$website) {
  83 + continue;
  84 + }
  85 +
80 //获取站点对应项目版本 86 //获取站点对应项目版本
81 $project_version = InquiryProject::select(['version'])->where('domain', 'like', '%' . $website . '%')->orWhere('test_domain', 'like', '%' . $website . '%')->first(); 87 $project_version = InquiryProject::select(['version'])->where('domain', 'like', '%' . $website . '%')->orWhere('test_domain', 'like', '%' . $website . '%')->first();
82 if (!$project_version) { 88 if (!$project_version) {
@@ -84,6 +90,7 @@ class InquiryForwardLogic extends BaseLogic @@ -84,6 +90,7 @@ class InquiryForwardLogic extends BaseLogic
84 } 90 }
85 $is_v6 = $project_version->version == 6 ? 1 : 0; 91 $is_v6 = $project_version->version == 6 ? 1 : 0;
86 92
  93 +
87 //计算发送时间 94 //计算发送时间
88 if ($this->param['inquiry_diff'] > 0) { 95 if ($this->param['inquiry_diff'] > 0) {
89 $start_at = date('Y-m-d H:i:s', strtotime($this->param['inquiry_date'] . ' -' . $this->param['inquiry_diff'] . ' hours')); 96 $start_at = date('Y-m-d H:i:s', strtotime($this->param['inquiry_date'] . ' -' . $this->param['inquiry_diff'] . ' hours'));
@@ -156,6 +163,7 @@ class InquiryForwardLogic extends BaseLogic @@ -156,6 +163,7 @@ class InquiryForwardLogic extends BaseLogic
156 163
157 $lists = []; 164 $lists = [];
158 if (count($re_route) > 0) { 165 if (count($re_route) > 0) {
  166 + //根据项目id查询项目,并根据询盘量排序
159 $project_ids = array_column($re_route, 'project_id'); 167 $project_ids = array_column($re_route, 'project_id');
160 $re_project = InquiryProject::select(['id', 'project', 'channel', 'domain'])->whereIn('id', $project_ids)->orderBy('recent_inquiry', 'asc')->get(); 168 $re_project = InquiryProject::select(['id', 'project', 'channel', 'domain'])->whereIn('id', $project_ids)->orderBy('recent_inquiry', 'asc')->get();
161 169
@@ -184,8 +192,7 @@ class InquiryForwardLogic extends BaseLogic @@ -184,8 +192,7 @@ class InquiryForwardLogic extends BaseLogic
184 $lists[] = [ 192 $lists[] = [
185 'id' => $vp->id, 193 'id' => $vp->id,
186 'project' => $vp->project, 194 'project' => $vp->project,
187 - 'domain' => $vp->domain,  
188 - 'route' => $route 195 + 'route' => $vp->domain . $route
189 ]; 196 ];
190 } 197 }
191 } 198 }