Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -831,7 +831,7 @@ if (!function_exists('curlGet')) {
     function curlGet($url)
     function curlGet($url)
     {
     {
         $ch1 = curl_init();
         $ch1 = curl_init();
-        $timeout = 60;
+        $timeout = 10;
         curl_setopt($ch1, CURLOPT_URL, $url);
         curl_setopt($ch1, CURLOPT_URL, $url);
         curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch1, CURLOPT_ENCODING, '');
         curl_setopt($ch1, CURLOPT_ENCODING, '');

@@ -19,6 +19,7 @@ use App\Models\Inquiry\ReInquiryCount;
 use App\Models\Inquiry\ReInquiryDetail;
 use App\Models\Inquiry\ReInquiryDetail;
 use App\Models\Inquiry\ReInquiryForm;
 use App\Models\Inquiry\ReInquiryForm;
 use App\Models\Inquiry\ReInquiryTask;
 use App\Models\Inquiry\ReInquiryTask;
+use App\Models\Project\Payment;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Utils\HttpUtils;
 use App\Utils\HttpUtils;
 use App\Utils\LogUtils;
 use App\Utils\LogUtils;
@@ -101,6 +102,11 @@ class AdsController extends BaseController
                         $item['target'][$k]['is_ad_fee'] = $project->deploy_build->ads_price ? 1 : 0;
                         $item['target'][$k]['is_ad_fee'] = $project->deploy_build->ads_price ? 1 : 0;
                     }
                     }
                 }
                 }
+                $item['target'][$k]['mark'] = [];
+                !$item['target'][$k]['is_ad_fee'] && $item['target'][$k]['mark'][] = 'green';
+                $item['target'][$k]['is_ad_fee'] && $item['target'][$k]['mark'][] = 'black';
+                $item['target'][$k]['is_repeat'] && $item['target'][$k]['mark'][] = 'red';
+                $item['target'][$k]['price'] > 90000 && $item['target'][$k]['mark'][] = 'blue';
             }
             }
             $item['cost'] = ReInquiryCost::getCostByAdIds($item['ad_id']);
             $item['cost'] = ReInquiryCost::getCostByAdIds($item['ad_id']);
         }
         }
@@ -265,6 +271,7 @@ class AdsController extends BaseController
                     'agent' => Channel::getChannelText($channel['user_id']??0),
                     'agent' => Channel::getChannelText($channel['user_id']??0),
                     'agent_group' => trim(explode('-', Channel::getChannelText($channel['user_id']??0))[0]),
                     'agent_group' => trim(explode('-', Channel::getChannelText($channel['user_id']??0))[0]),
                     'domain' => $domain,
                     'domain' => $domain,
+                    'price' => Payment::where('project_id', $domain_info['project_id'])->value('amount') ?: 0
                 ];
                 ];
                 return $this->response('success', Code::SUCCESS, $data);
                 return $this->response('success', Code::SUCCESS, $data);
             }
             }
@@ -279,6 +286,7 @@ class AdsController extends BaseController
             'agent' => $res['data'],
             'agent' => $res['data'],
             'agent_group' => trim(explode('-', explode(',', $res['data'] ?? '')[0])[0]),
             'agent_group' => trim(explode('-', explode(',', $res['data'] ?? '')[0])[0]),
             'domain' => $domain,
             'domain' => $domain,
+            'price' => $res['price'] ?? 0,
         ];
         ];
         return $this->response('success', Code::SUCCESS, $data);
         return $this->response('success', Code::SUCCESS, $data);
     }
     }

@@ -280,14 +280,9 @@ class DomainInfoLogic extends BaseLogic
                     continue;
                     continue;
                 }
                 }
 
 
-                $origin_array = parse_url($v['origin']);
-                $origin_url = isset($origin_array['path']) && $origin_array['path'] ? $origin_array['path'] : $origin_array['host'];
-
-                $target_array = parse_url($v['target']);
-                $target_url = isset($target_array['path']) && $target_array['path'] ? $target_array['path'] : $target_array['host'];
-                if((!in_array($origin_url,$unique_extend))){
-                    $unique_extend[] = $origin_url;
-                    $extend_config[] = ['origin'=>$origin_url,'target'=>$target_url];
+                if((!in_array($v['origin'],$unique_extend))){
+                    $unique_extend[] = $v['origin'];
+                    $extend_config[] = ['origin'=>$v['origin'],'target'=>$v['target']];
                 }
                 }
             }
             }
         }
         }
@@ -303,14 +298,9 @@ class DomainInfoLogic extends BaseLogic
                     continue;
                     continue;
                 }
                 }
 
 
-                $amp_origin_array = parse_url($va['origin']);
-                $amp_origin_url = isset($amp_origin_array['path']) && $amp_origin_array['path'] ? $amp_origin_array['path'] : $amp_origin_array['host'];
-
-                $amp_target_array = parse_url($va['target']);
-                $amp_target_url = isset($amp_target_array['path']) && $amp_target_array['path'] ? $amp_target_array['path'] : $amp_target_array['host'];
-                if((!in_array($amp_origin_url,$amp_unique_extend))){
-                    $amp_unique_extend[] = $amp_origin_url;
-                    $amp_extend_config[] = ['origin'=>$amp_origin_url,'target'=>$amp_target_url];
+                if((!in_array($va['origin'],$amp_unique_extend))){
+                    $amp_unique_extend[] = $va['origin'];
+                    $amp_extend_config[] = ['origin'=>$va['origin'],'target'=>$va['target']];
                 }
                 }
             }
             }
         }
         }

@@ -72,6 +72,7 @@ class ReInquiryTask extends Base
             $item['agent'] = $item['agent'] ?? '';
             $item['agent'] = $item['agent'] ?? '';
             $item['agent_group'] = $item['agent_group'] ?? '';
             $item['agent_group'] = $item['agent_group'] ?? '';
             $item['is_require'] = $item['is_require'] ?? 0;
             $item['is_require'] = $item['is_require'] ?? 0;
+            $item['price'] = $item['price'] ?? 0;
         }
         }
         return  $value;
         return  $value;
     }
     }