u

app/Http/Controllers/admin/Bet.php

@@ -8,6 +8,7 @@ use App\Services\BetService;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 use Exception;
+use App\Models\Bet as BetModel;
 
 class Bet extends Controller
 {
@@ -28,7 +29,27 @@ class Bet extends Controller
                 'end_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:start_time'],
                 'is_winner' => ['nullable', 'integer', 'in:0,1'],
             ]);
-            $result = BetService::paginate($params);
+
+            $page = request()->input('page', 1);
+            $limit = request()->input('limit', 10);
+
+            $query = BetModel::where(BetService::getWhere($params))
+                ->with(['user']);
+
+
+            if (isset($params['username']) && !empty($params['username'])) {
+                $username = $params['username'];
+                $query = $query->whereHas('user', function ($query) use ($username) {
+                    $query->where('username', $username);
+                });
+            }
+
+            $count = $query->count();
+            $query->orderBy('id', 'desc');
+            $list = $query->forPage($page, $limit)->get();
+
+
+            $result = ['total' => $count, 'data' => $list];
             foreach ($result['data'] as &$item) {
                 $item['is_winner'] = null;
                 if ($item['status'] == 2) {