正在显示
1 个修改的文件
包含
12 行增加
和
9 行删除
| @@ -139,13 +139,15 @@ class AdsController extends BaseController | @@ -139,13 +139,15 @@ class AdsController extends BaseController | ||
| 139 | //是否v6 | 139 | //是否v6 |
| 140 | $domain_info = DomainInfo::where('domain', $domain)->first(); | 140 | $domain_info = DomainInfo::where('domain', $domain)->first(); |
| 141 | if($domain_info){ | 141 | if($domain_info){ |
| 142 | - $channel = Project::where('id', $domain_info['project_id'])->value('channel'); | ||
| 143 | - $data = [ | ||
| 144 | - 'is_v6' => 1, | ||
| 145 | - 'agent' => trim(explode('-', Channel::getChannelText($channel['user_id']??0))[0]), | ||
| 146 | - 'domain' => $domain, | ||
| 147 | - ]; | ||
| 148 | - return $this->response('success', Code::SUCCESS, $data); | 142 | + $channel = Project::where('id', $domain_info['project_id'])->where('delete_status', 1)->value('channel'); |
| 143 | + if($channel){ | ||
| 144 | + $data = [ | ||
| 145 | + 'is_v6' => 1, | ||
| 146 | + 'agent' => trim(explode('-', Channel::getChannelText($channel['user_id']??0))[0]), | ||
| 147 | + 'domain' => $domain, | ||
| 148 | + ]; | ||
| 149 | + return $this->response('success', Code::SUCCESS, $data); | ||
| 150 | + } | ||
| 149 | } | 151 | } |
| 150 | $res = (new QuanqiusouApi())->getV5Agent($domain); | 152 | $res = (new QuanqiusouApi())->getV5Agent($domain); |
| 151 | if(empty($res['status']) || $res['status'] != 200){ | 153 | if(empty($res['status']) || $res['status'] != 200){ |
| @@ -228,7 +230,8 @@ class AdsController extends BaseController | @@ -228,7 +230,8 @@ class AdsController extends BaseController | ||
| 228 | $domain = trim($request->input('domain')); | 230 | $domain = trim($request->input('domain')); |
| 229 | $company = trim($request->input('company')); | 231 | $company = trim($request->input('company')); |
| 230 | $operator = trim($request->input('operator')); | 232 | $operator = trim($request->input('operator')); |
| 231 | - $num = trim($request->input('num')); | 233 | + $num = intval($request->input('num')); |
| 234 | + $row = intval($request->input('row', 20)); | ||
| 232 | 235 | ||
| 233 | $result = ReInquiryCount::when($task_id, function ($query, $task_id) { | 236 | $result = ReInquiryCount::when($task_id, function ($query, $task_id) { |
| 234 | return $query->WhereRaw("FIND_IN_SET({$task_id}, `task_ids`)"); | 237 | return $query->WhereRaw("FIND_IN_SET({$task_id}, `task_ids`)"); |
| @@ -243,7 +246,7 @@ class AdsController extends BaseController | @@ -243,7 +246,7 @@ class AdsController extends BaseController | ||
| 243 | return $query->where('num', $operator?:'=', $num); | 246 | return $query->where('num', $operator?:'=', $num); |
| 244 | }) | 247 | }) |
| 245 | ->orderBy('num', 'desc') | 248 | ->orderBy('num', 'desc') |
| 246 | - ->paginate(); | 249 | + ->paginate($row); |
| 247 | 250 | ||
| 248 | foreach ($result as $item){ | 251 | foreach ($result as $item){ |
| 249 | $item->tasks = $item->tasks; //调用访问器 | 252 | $item->tasks = $item->tasks; //调用访问器 |
-
请 注册 或 登录 后发表评论