search order

app/Http/Controllers/Game/PayRechargeController.php

@@ -61,6 +61,7 @@ class PayRechargeController extends Controller
 
         $list = Order::query()->where($where)
             ->orderBy('finished_at', 'desc')
+            ->where('finished_at', '>=', date('Y-m-d', strtotime('-7 day')))
             ->selectRaw('amount,payment_code,order_sn as payment_sn,finished_at,created_at,pay_status,type')
             ->paginate($pageSize);
 //            ->paginate(15,['*'],'page',1);

app/Http/Controllers/Game/WithDrawInfoController.php

@@ -61,11 +61,36 @@ class WithDrawInfoController
 //            return apiReturnFail(['web.user.paypass_fail', 'A senha original está errada, digite-a novamente.'], '', 2);
 //        }
 
-        $list=DB::table('QPAccountsDB.dbo.OrderWithDraw')
-            ->where('UserID', $UserID)
-            ->selectRaw("CreateDate,OrderId,[State],WithDraw,ServiceFee,PixType")
-            ->orderBy('CreateDate', 'desc')
-            ->paginate(100);
+        $scoreType = intval($request->input('score_type', -1));
+        if (!in_array($scoreType, [-1, 0, 1], true)) {
+            return apiReturnFail(['web.withdraw.params_error', 'score_type must be -1, 0 or 1'], [], 422);
+        }
+        $sort = strtolower($request->input('sort', 'desc'));
+        $sort = in_array($sort, ['asc', 'desc']) ? $sort : 'desc';
+        $sortBy = strtolower($request->input('sort_by', 'createdate'));
+        $pageSize = intval($request->input('page_size', 10));
+        if ($pageSize <= 0) {
+            $pageSize = 100;
+        }
+
+        $query = DB::table('QPAccountsDB.dbo.OrderWithDraw')
+            ->where('UserID', $UserID);
+
+        if ($scoreType !== -1) {
+            $query->where('score_type', $scoreType);
+        }
+
+        $allowedSortColumns = [
+            'withdraw' => 'WithDraw',
+            'createdate' => 'CreateDate',
+        ];
+        $sortColumn = $allowedSortColumns[$sortBy] ?? 'CreateDate';
+
+        $list = $query
+            ->selectRaw("CreateDate,OrderId,[State],WithDraw,ServiceFee,PixType,score_type")
+            ->where('CreateDate', '>=', date('Y-m-d', strtotime('-30 day')))
+            ->orderBy($sortColumn, $sort)
+            ->paginate($pageSize);
         return apiReturnSuc($list);
     }