修改足球订单

app/Http/Controllers/admin/Order.php

@@ -95,8 +95,7 @@ class Order extends Controller
             $limit = request()->input('limit', 15);
 
             $query = OrderModel::join('sport_odds', 'sport_odds.odd_name_en', '=', 'sport_order.odd_name')
-                        ->join('sport', 'sport.data_id', '=', 'sport_order.issue')
-                        ->distinct();
+                        ->join('sport', 'sport.data_id', '=', 'sport_order.issue');
             if (!empty($params['id'])) {
                 $query = $query->where('sport_order.id', $params['id']);
             }
@@ -145,9 +144,9 @@ class Order extends Controller
                 $query = $query->where('guest_team|guest_team_en', 'like', '%' . $params['guest_team'] . '%');
             }
             
-            $count = $query->count();
-            $list = $query
-                ->select(['sport_order.*','sport_odds.odd_name as odd_name', 'sport.league', 'sport.league_en', 'sport.home_team', 'sport.home_team_en', 'sport.guest_team', 'sport.guest_team_en'])
+            $count = $query->distinct()->count('sport_order.id');
+            $list = $query->distinct()
+                ->select(['sport_order.*','sport_odds.odd_name as odd_name', 'sport.league', 'sport.league_en', 'sport.home_team', 'sport.home_team_en','sport.home_team_logo', 'sport.guest_team', 'sport.guest_team_en','sport.guest_team_logo'])
                 ->forPage($page, $limit)
                 ->orderByDesc('sport_order.create_time')
                 ->get();
@@ -175,7 +174,7 @@ class Order extends Controller
             $order = OrderModel::join('sport_odds', 'sport_odds.odd_name_en', '=', 'sport_order.odd_name')
                         ->join('sport', 'sport.data_id', '=', 'sport_order.issue')
                         ->where('sport_order.order_id', $order_id)
-                        ->select(['sport_order.*','sport_odds.odd_name as odd_name', 'sport.league', 'sport.league_en', 'sport.home_team', 'sport.home_team_en', 'sport.guest_team', 'sport.guest_team_en'])
+                        ->select(['sport_order.*','sport_odds.odd_name as odd_name', 'sport.league', 'sport.league_en', 'sport.home_team', 'sport.home_team_en','sport.home_team_logo', 'sport.guest_team', 'sport.guest_team_en','sport.guest_team_logo'])
                         ->first();
             if (!$order) throw new Exception('订单不存在');
             $order = $order->toArray();