修改

app/Http/Controllers/admin/Order.php

@@ -90,50 +90,51 @@ class Order extends Controller
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 15);
 
-            $query = new OrderModel();
+            $query = OrderModel::join('sport_odds', 'sport_odds.odd_name_en', '=', 'sport_order.odd_name');
             if (!empty($params['id'])) {
-                $query = $query->where('id', $params['id']);
+                $query = $query->where('sport_order.id', $params['id']);
             }
             if (!empty($params['start_time'])) {
                 $startTime = strtotime($params['start_time'] . " 00:00:00");
-                $query = $query->where('create_time', '>=', $startTime);
+                $query = $query->where('sport_order.create_time', '>=', $startTime);
             }
             if (!empty($params['end_time'])) {
                 $endTime = strtotime($params['end_time'] . " 23:59:59");
-                $query = $query->where('create_time', '<=', $endTime);
+                $query = $query->where('sport_order.create_time', '<=', $endTime);
             }
-            if (!empty($params['id'])) {
-                $query = $query->where('id', $params['id']);
+            if (!empty($params['issue'])) {
+                $query = $query->where('sport_order.issue', $params['issue']);
             }
             if (!empty($params['order_id'])) {
                 $query = $query->where('order_id', $params['order_id']);
             }
             if (!empty($params['user_id'])) {
-                $query = $query->where('user_id', $params['user_id']);
+                $query = $query->where('sport_order.user_id', $params['user_id']);
             }
             if (isset($params['status'])) {
-                $query = $query->where('status', $params['status']);
+                $query = $query->where('sport_order.status', $params['status']);
             }
             if (isset($params['return_status'])) {
-                $query = $query->where('return_status', $params['return_status']);
+                $query = $query->where('sport_order.return_status', $params['return_status']);
             }
             if (isset($params['pay_status'])) {
-                $query = $query->where('pay_status', $params['pay_status']);
+                $query = $query->where('sport_order.pay_status', $params['pay_status']);
             }
             if (isset($params['is_win'])) {
-                $query = $query->where('is_win', $params['is_win']);
+                $query = $query->where('sport_order.is_win', $params['is_win']);
             }
             if (isset($params['settlement_status'])) {
-                $query = $query->where('settlement_status', $params['settlement_status']);
+                $query = $query->where('sport_order.settlement_status', $params['settlement_status']);
             }
             if (isset($params['is_roll'])) {
-                $query = $query->where('is_roll', $params['is_roll']);
+                $query = $query->where('sport_order.is_roll', $params['is_roll']);
             }
 
             $count = $query->count();
             $list = $query
+                ->select(['sport_order.*','sport_odds.odd_name as odd_name'])
                 ->forPage($page, $limit)
-                ->orderByDesc('create_time')
+                ->orderByDesc('sport_order.create_time')
                 ->get();
         } catch (Exception $e) {
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());