作者 赵彬吉

fb is_ad_fee

@@ -94,6 +94,13 @@ class AdsController extends BaseController @@ -94,6 +94,13 @@ class AdsController extends BaseController
94 foreach ($item['target'] as $k=>$target){ 94 foreach ($item['target'] as $k=>$target){
95 $repeat = ReInquiryTask::where('target', 'like', '%"'.$target['url'].'"%')->where('id', '<>', $item['id'])->first(); 95 $repeat = ReInquiryTask::where('target', 'like', '%"'.$target['url'].'"%')->where('id', '<>', $item['id'])->first();
96 $item['target'][$k]['is_repeat'] = $repeat ? 1 : 0; 96 $item['target'][$k]['is_repeat'] = $repeat ? 1 : 0;
  97 + $item['target'][$k]['is_ad_fee'] = 0;
  98 + if($item['target'][$k]['is_v6']){
  99 + $project = Project::getProjectByDomain($item['target'][$k]['url']);
  100 + if($project && $project->deploy_build){
  101 + $item['target'][$k]['is_ad_fee'] = $project->deploy_build->ads_price ? 1 : 0;
  102 + }
  103 + }
97 } 104 }
98 $item['cost'] = ReInquiryCost::getCostByAdIds($item['ad_id']); 105 $item['cost'] = ReInquiryCost::getCostByAdIds($item['ad_id']);
99 } 106 }
@@ -395,10 +402,14 @@ class AdsController extends BaseController @@ -395,10 +402,14 @@ class AdsController extends BaseController
395 $is_v6 = 1; 402 $is_v6 = 1;
396 } 403 }
397 } 404 }
398 - if($is_v6){  
399 - $item['project_id'] = DomainInfo::where('domain', $item['domain'])->value('project_id') ?: 0;  
400 - }else{  
401 $item['project_id'] = 0; 405 $item['project_id'] = 0;
  406 + $item['is_ad_fee'] = 0;
  407 + if($is_v6){
  408 + $project = Project::getProjectByDomain($item['domain']);
  409 + if($project && $project->deploy_build){
  410 + $item['project_id'] = $project['id'];
  411 + $item['is_ad_fee'] = $project->deploy_build->ads_price ? 1 : 0;
  412 + }
402 } 413 }
403 } 414 }
404 415
@@ -80,9 +80,13 @@ class ReInquiryCount extends Base @@ -80,9 +80,13 @@ class ReInquiryCount extends Base
80 return Arr::setToArr($value); 80 return Arr::setToArr($value);
81 } 81 }
82 82
83 - public function getTasksAttribute(){  
84 - $tasks = ReInquiryTask::whereIn('id', $this->task_ids)->select(['title', 'industry','target', 'status'])->get()->toArray();  
85 - foreach ($tasks as &$task){ 83 + public function getTasksAttribute()
  84 + {
  85 + $cache_key = 'ReInquiryCountTasks_' . Arr::arrToSet($this->task_ids);
  86 + $tasks = Cache::get($cache_key);
  87 + if (!$tasks) {
  88 + $tasks = ReInquiryTask::whereIn('id', $this->task_ids)->select(['title', 'industry', 'target', 'status'])->get()->toArray();
  89 + foreach ($tasks as &$task) {
86 $target = collect($task['target'])->where('url', $this->domain)->first(); 90 $target = collect($task['target'])->where('url', $this->domain)->first();
87 $task['is_del'] = $target ? 0 : 1; 91 $task['is_del'] = $target ? 0 : 1;
88 $task['agent'] = $target['agent'] ?? ''; 92 $task['agent'] = $target['agent'] ?? '';
@@ -90,6 +94,8 @@ class ReInquiryCount extends Base @@ -90,6 +94,8 @@ class ReInquiryCount extends Base
90 $task['agent_group'] = $target['agent_group'] ?? ''; 94 $task['agent_group'] = $target['agent_group'] ?? '';
91 unset($task['target']); 95 unset($task['target']);
92 } 96 }
  97 + Cache::put($cache_key, $tasks, 7200);
  98 + }
93 return $tasks; 99 return $tasks;
94 } 100 }
95 101