|
|
@@ -31,6 +31,7 @@ class Sport extends Controller
|
|
|
'is_locked' => ['nullable', 'integer'],
|
|
|
'start_time' => ['nullable', 'string'],
|
|
|
'end_time' => ['nullable', 'string'],
|
|
|
+ 'error' => ['nullable', 'integer'],
|
|
|
]);
|
|
|
$page = request()->input('page', 1);
|
|
|
$limit = request()->input('limit', 15);
|
|
|
@@ -50,6 +51,11 @@ class Sport extends Controller
|
|
|
}
|
|
|
if (isset($params['state']) && $params['state'] !== null) {
|
|
|
$query = $query->where('state', $params['state']);
|
|
|
+ if ($params['state'] >= 2) {
|
|
|
+ $order = ['game_time' => 'desc'];
|
|
|
+ } else {
|
|
|
+ $order = ['game_time' => 'asc', 'is_roll' => 'desc'];
|
|
|
+ }
|
|
|
}
|
|
|
if (isset($params['status']) && $params['status'] !== null) {
|
|
|
$query = $query->where('status', $params['status']);
|
|
|
@@ -63,10 +69,14 @@ class Sport extends Controller
|
|
|
if (!empty($params['end_time'])) {
|
|
|
$query = $query->where('game_time', '<', strtotime($params['end_time'].' 23:59:59'));
|
|
|
}
|
|
|
+ if (isset($params['error']) && $params['error'] !== null) {
|
|
|
+ $query = $query->where('error', $params['error']);
|
|
|
+ }
|
|
|
+
|
|
|
$count = $query->count();
|
|
|
$list = $query
|
|
|
->forPage($page, $limit)
|
|
|
- ->orderBy('game_time','asc')
|
|
|
+ ->orderBy($order)
|
|
|
->get();
|
|
|
foreach($list as $item) {
|
|
|
$item['game_time'] = date('Y-m-d H:i:s', $item['game_time']);
|