正在显示
4 个修改的文件
包含
7 行增加
和
4 行删除
| @@ -315,7 +315,10 @@ class WebTraffic extends Command | @@ -315,7 +315,10 @@ class WebTraffic extends Command | ||
| 315 | $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString(); | 315 | $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString(); |
| 316 | $query->where('pdo.start_date', '<', $startTime); | 316 | $query->where('pdo.start_date', '<', $startTime); |
| 317 | } | 317 | } |
| 318 | - })->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get(); | 318 | + })->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id']) |
| 319 | + ->forPage($page, 500) | ||
| 320 | + ->orderBy('project_id') | ||
| 321 | + ->get(); | ||
| 319 | //其他地方在引流的域名 | 322 | //其他地方在引流的域名 |
| 320 | $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); | 323 | $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); |
| 321 | $data = []; | 324 | $data = []; |
| @@ -348,7 +348,7 @@ class WebTrafficRussia extends Command | @@ -348,7 +348,7 @@ class WebTrafficRussia extends Command | ||
| 348 | $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString(); | 348 | $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString(); |
| 349 | $query->where('pdo.start_date', '<', $startTime); | 349 | $query->where('pdo.start_date', '<', $startTime); |
| 350 | } | 350 | } |
| 351 | - })->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get(); | 351 | + })->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->orderBy('project_id')->get(); |
| 352 | //其他地方在引流的域名 | 352 | //其他地方在引流的域名 |
| 353 | $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); | 353 | $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); |
| 354 | $data = []; | 354 | $data = []; |
| @@ -329,7 +329,7 @@ class WebTrafficRussiaSpecial extends Command | @@ -329,7 +329,7 @@ class WebTrafficRussiaSpecial extends Command | ||
| 329 | ->where('gl_project.is_upgrade', 0) //非升级项目 | 329 | ->where('gl_project.is_upgrade', 0) //非升级项目 |
| 330 | ->where('gl_project.main_lang_id', $ru_lang_id)// 俄语站 | 330 | ->where('gl_project.main_lang_id', $ru_lang_id)// 俄语站 |
| 331 | ->whereIn('gl_project.id', array_keys($projects)) | 331 | ->whereIn('gl_project.id', array_keys($projects)) |
| 332 | - ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get(); | 332 | + ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->orderBy('project_id')->get(); |
| 333 | //其他地方在引流的域名 | 333 | //其他地方在引流的域名 |
| 334 | // $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); | 334 | // $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); |
| 335 | $other = []; | 335 | $other = []; |
| @@ -295,7 +295,7 @@ class WebTrafficSpecial extends Command | @@ -295,7 +295,7 @@ class WebTrafficSpecial extends Command | ||
| 295 | ->where('gl_project.is_upgrade', 0) //非升级项目 | 295 | ->where('gl_project.is_upgrade', 0) //非升级项目 |
| 296 | ->where('gl_project.main_lang_id', '<>', $ru_lang_id) //非俄语站 | 296 | ->where('gl_project.main_lang_id', '<>', $ru_lang_id) //非俄语站 |
| 297 | ->whereIn('gl_project.id', array_keys($projects)) | 297 | ->whereIn('gl_project.id', array_keys($projects)) |
| 298 | - ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get(); | 298 | + ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->orderBy('project_id')->get(); |
| 299 | //其他地方在引流的域名 | 299 | //其他地方在引流的域名 |
| 300 | // $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); | 300 | // $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); |
| 301 | $other = []; | 301 | $other = []; |
-
请 注册 或 登录 后发表评论