Merge branch 'master' of 47.76.126.2:seven/bot-28

app/Http/Controllers/admin/Rebate.php

@@ -22,8 +22,10 @@ class Rebate extends Controller
             $search = request()->validate([
                 'page' => ['nullable', 'integer', 'min:1'],
                 'limit' => ['nullable', 'integer', 'min:1'],
-                'member_id' => ['nullable', 'string', 'min:1'],
+                'member_id' => ['nullable', 'integer', 'min:1'],
                 'date' => ['nullable', 'date_format:Y-m-d'],
+                'username' => ['nullable', 'string'],
+                'first_name' => ['nullable', 'string'],
             ]);
             $result = RebateService::paginate($search);
         } catch (ValidationException $e) {

app/Services/RebateService.php

@@ -45,6 +45,14 @@ class RebateService extends BaseService
             $where[] = ['member_id', '=', $search['member_id']];
         }
 
+        if (isset($search['first_name']) && !empty($search['first_name'])) {
+            $where[] = ['first_name', '=', $search['first_name']];
+        }
+
+        if (isset($search['username']) && !empty($search['username'])) {
+            $where[] = ['username', '=', $search['username']];
+        }
+
         if (isset($search['status']) && !empty($search['status'])) {
             $where[] = ['status', '=', $search['status']];
         }
@@ -89,7 +97,10 @@ class RebateService extends BaseService
 
         $paginator = self::model()::where(self::getWhere($search))
             ->where('date', '<', $date)
-            ->with('wallet:user_id,member_id,address,available_balance')->paginate($limit);
+            ->orderByDesc('date')
+            ->orderBy('status')
+            ->orderByDesc('betting_amount')
+            ->paginate($limit);
         return ['total' => $paginator->total(), 'data' => $paginator->items()];
     }
 }

routes/admin.php

@@ -38,7 +38,6 @@ Route::get('/fake', [Bet::class, 'fake']);
 Route::get('/fakel', [Issue::class, 'fakeLotteryDraw']);
 
 
-
 Route::middleware(['admin.jwt'])->group(function () {
 
 
@@ -129,7 +128,6 @@ Route::middleware(['admin.jwt'])->group(function () {
             Route::get('/getPendingTasks', [Wallet::class, 'getPendingTasks']);
 
 
-
         });
 
         Route::prefix('/user')->group(function () {