修改赛事

app/Http/Controllers/admin/Banner.php

@@ -68,6 +68,7 @@ class Banner extends Controller
                 'link' => ['nullable'],
                 'type' => ['required'],
                 'sort' => ['nullable'],
+                'lang' => ['required'],
             ]);
             $id = $params['id'] ?? null;
 
@@ -78,7 +79,8 @@ class Banner extends Controller
                     'image' => $params['image'],
                     'link' => $params['link'],
                     'type' => $params['type'],
-                    'sort' => $params['sort']
+                    'sort' => $params['sort'],
+                    'lang' => $params['lang'],
                 ],
             );
             DB::commit();

app/Http/Controllers/admin/Sport.php

@@ -35,6 +35,7 @@ class Sport extends Controller
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 15);
+            $order = 'asc';
 
             $query = new SportModel();
             if (!empty($params['data_id'])) {
@@ -52,9 +53,7 @@ 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'];
+                    $order = 'desc';
                 }
             }
             if (isset($params['status']) && $params['status'] !== null) {
@@ -71,15 +70,16 @@ class Sport extends Controller
             }
             if (isset($params['error']) && $params['error'] !== null) {
                 $query = $query->where('error', $params['error']);
-                $order = ['game_time' => 'desc'];
+                $order = 'desc';
             }
 
             $count = $query->count();
             $list = $query
                 ->forPage($page, $limit)
-                ->orderBy($order)
+                ->orderBy('game_time', $order)
+                ->orderBy('is_roll', 'desc')
                 ->get();
-            foreach($list as $item) {
+            foreach($list as &$item) {
                 $item['game_time'] = date('Y-m-d H:i:s', $item['game_time']);
                 $item['rbt'] = date('Y-m-d H:i:s', $item['rbt']);
                 $item['fixture_status'] = json_decode($item['fixture_status'], true);
@@ -107,7 +107,6 @@ class Sport extends Controller
             $info['game_time'] = date('Y-m-d H:i:s', $info['game_time']);
             $info['rbt'] = date('Y-m-d H:i:s', $info['rbt']);
             $info['fixture_status'] = json_decode($info['fixture_status'], true);
-
             $info['odds'] = $info['odds'] ? json_decode($info['odds'], true) : null;
             $info['event'] = SportEvent::where('data_id', $info['data_id'])->get();
             $info['odd_ids_locked'] = $info['odd_ids_locked'] ? json_decode($info['odd_ids_locked'], true) : [];