feat(admin): 增强玩家注单查询过滤并返回金额格式化字段

app/Http/Controllers/Api/V1/Admin/Player/AdminPlayerTicketItemsIndexController.php

@@ -6,6 +6,7 @@ use App\Models\Player;
 use App\Models\TicketItem;
 use App\Support\ApiResponse;
 use App\Support\PaginationTrait;
+use App\Support\CurrencyFormatter;
 use Illuminate\Http\JsonResponse;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\AdminPlayerTicketItemsRequest;
@@ -13,7 +14,7 @@ use App\Http\Requests\Admin\AdminPlayerTicketItemsRequest;
 /**
  * GET /api/v1/admin/players/{player}/ticket-items — 客服/财务按玩家查注单（PRD §15.4）。
  *
- * Query：`page`、`per_page`（最大 50）、`draw_no`（可选，精确期号）。
+ * Query：`page`、`per_page`（最大 50）、`draw_no`、`status[]`、`number`、`start_date`、`end_date`。
  */
 final class AdminPlayerTicketItemsIndexController extends Controller
 {
@@ -27,6 +28,17 @@ final class AdminPlayerTicketItemsIndexController extends Controller
         if (is_string($drawNo)) {
             $drawNo = trim($drawNo);
         }
+        $statusInput = $request->validated('status', []);
+        if (is_string($statusInput)) {
+            $statusInput = [$statusInput];
+        }
+        $statusValues = is_array($statusInput) ? array_values(array_filter(array_map(
+            fn ($status) => is_string($status) ? trim($status) : '',
+            $statusInput,
+        ))) : [];
+        $number = trim((string) $request->validated('number', ''));
+        $startDate = $request->validated('start_date');
+        $endDate = $request->validated('end_date');
 
         $query = TicketItem::query()
             ->where('ticket_items.player_id', $player->id)
@@ -40,9 +52,35 @@ final class AdminPlayerTicketItemsIndexController extends Controller
             $query->whereHas('draw', fn ($q) => $q->where('draw_no', $drawNo));
         }
 
+        if ($statusValues !== []) {
+            $query->whereIn('ticket_items.status', $statusValues);
+        }
+
+        if ($number !== '') {
+            $query->where(function ($q) use ($number): void {
+                $q->where('ticket_items.original_number', 'like', '%'.$number.'%')
+                    ->orWhere('ticket_items.normalized_number', 'like', '%'.$number.'%')
+                    ->orWhere('ticket_items.ticket_no', 'like', '%'.$number.'%')
+                    ->orWhereHas('order', fn ($order) => $order->where('order_no', 'like', '%'.$number.'%'));
+            });
+        }
+
+        if (is_string($startDate) && $startDate !== '') {
+            $query->whereHas('order', fn ($q) => $q->whereDate('created_at', '>=', $startDate));
+        }
+
+        if (is_string($endDate) && $endDate !== '') {
+            $query->whereHas('order', fn ($q) => $q->whereDate('created_at', '<=', $endDate));
+        }
+
         $paginator = $query->paginate(perPage: $perPage, page: $page, columns: ['*']);
 
         $items = collect($paginator->items())->map(function (TicketItem $row): array {
+            $totalBet = (int) $row->total_bet_amount;
+            $actualDeduct = (int) $row->actual_deduct_amount;
+            $winAmount = (int) $row->win_amount;
+            $jackpotWin = (int) $row->jackpot_win_amount;
+
             return [
                 'ticket_no' => $row->ticket_no,
                 'order_no' => $row->order?->order_no,
@@ -50,13 +88,17 @@ final class AdminPlayerTicketItemsIndexController extends Controller
                 'currency_code' => $row->order?->currency_code,
                 'play_code' => $row->play_code,
                 'original_number' => $row->original_number,
-                'total_bet_amount' => (int) $row->total_bet_amount,
-                'actual_deduct_amount' => (int) $row->actual_deduct_amount,
+                'total_bet_amount' => $totalBet,
+                'total_bet_amount_formatted' => CurrencyFormatter::fromMinor($totalBet),
+                'actual_deduct_amount' => $actualDeduct,
+                'actual_deduct_amount_formatted' => CurrencyFormatter::fromMinor($actualDeduct),
                 'status' => $row->status,
                 'fail_reason_code' => $row->fail_reason_code,
                 'fail_reason_text' => $row->fail_reason_text,
-                'win_amount' => (int) $row->win_amount,
-                'jackpot_win_amount' => (int) $row->jackpot_win_amount,
+                'win_amount' => $winAmount,
+                'win_amount_formatted' => CurrencyFormatter::fromMinor($winAmount),
+                'jackpot_win_amount' => $jackpotWin,
+                'jackpot_win_amount_formatted' => CurrencyFormatter::fromMinor($jackpotWin),
                 'placed_at' => $row->order?->created_at?->toIso8601String(),
                 'updated_at' => $row->updated_at?->toIso8601String(),
             ];

app/Http/Requests/Admin/AdminPlayerTicketItemsRequest.php

@@ -25,6 +25,11 @@ final class AdminPlayerTicketItemsRequest extends FormRequest
             'page' => ['sometimes', 'integer', 'min:1'],
             'per_page' => ['sometimes', 'integer', 'min:1', 'max:50'],
             'draw_no' => ['sometimes', 'nullable', 'string', 'max:32'],
+            'status' => ['sometimes'],
+            'status.*' => ['string', 'max:32'],
+            'number' => ['sometimes', 'nullable', 'string', 'max:64'],
+            'start_date' => ['sometimes', 'nullable', 'date_format:Y-m-d'],
+            'end_date' => ['sometimes', 'nullable', 'date_format:Y-m-d'],
         ];
     }
 }

tests/Feature/AdminCsFinanceApisTest.php

@@ -113,6 +113,162 @@ test('admin lists ticket items for a player', function (): void {
         ->assertJsonPath('data.total', 0);
 });
 
+test('admin player ticket items support status number and date range filters', function (): void {
+    $token = mintCsFinanceAdminToken();
+
+    $player = Player::query()->create([
+        'site_code' => 'main',
+        'site_player_id' => 'csf-p3',
+        'username' => 'csf_u3',
+        'nickname' => null,
+        'default_currency' => 'NPR',
+        'status' => 0,
+    ]);
+
+    $draw1 = Draw::query()->create([
+        'draw_no' => '20260520-003',
+        'business_date' => '2026-05-20',
+        'sequence_no' => 3,
+        'status' => 'settled',
+        'start_time' => now()->subDay(),
+        'close_time' => now()->subDay(),
+        'draw_time' => now()->subDay(),
+        'cooling_end_time' => null,
+        'result_source' => null,
+        'current_result_version' => 1,
+        'settle_version' => 1,
+        'is_reopened' => false,
+    ]);
+
+    $draw2 = Draw::query()->create([
+        'draw_no' => '20260520-004',
+        'business_date' => '2026-05-20',
+        'sequence_no' => 4,
+        'status' => 'settled',
+        'start_time' => now()->subDay(),
+        'close_time' => now()->subDay(),
+        'draw_time' => now()->subDay(),
+        'cooling_end_time' => null,
+        'result_source' => null,
+        'current_result_version' => 1,
+        'settle_version' => 1,
+        'is_reopened' => false,
+    ]);
+
+    $order1 = TicketOrder::query()->create([
+        'order_no' => 'ORD-CSF-3',
+        'player_id' => $player->id,
+        'draw_id' => $draw1->id,
+        'currency_code' => 'NPR',
+        'total_bet_amount' => 1000,
+        'total_rebate_amount' => 0,
+        'total_actual_deduct' => 1000,
+        'total_estimated_payout' => 0,
+        'status' => 'settled',
+        'submit_source' => 'h5',
+        'client_trace_id' => null,
+    ]);
+
+    $order2 = TicketOrder::query()->create([
+        'order_no' => 'ORD-CSF-4',
+        'player_id' => $player->id,
+        'draw_id' => $draw2->id,
+        'currency_code' => 'NPR',
+        'total_bet_amount' => 2000,
+        'total_rebate_amount' => 0,
+        'total_actual_deduct' => 2000,
+        'total_estimated_payout' => 0,
+        'status' => 'settled',
+        'submit_source' => 'h5',
+        'client_trace_id' => null,
+    ]);
+
+    TicketOrder::query()->whereKey($order1->id)->update([
+        'created_at' => '2026-05-01 10:00:00',
+        'updated_at' => '2026-05-01 10:00:00',
+    ]);
+    TicketOrder::query()->whereKey($order2->id)->update([
+        'created_at' => '2026-05-10 10:00:00',
+        'updated_at' => '2026-05-10 10:00:00',
+    ]);
+
+    TicketItem::query()->create([
+        'ticket_no' => 'TKCSF0003',
+        'order_id' => $order1->id,
+        'player_id' => $player->id,
+        'draw_id' => $draw1->id,
+        'original_number' => '1234',
+        'normalized_number' => '1234',
+        'play_code' => 'big',
+        'dimension' => 4,
+        'digit_slot' => null,
+        'bet_mode' => null,
+        'unit_bet_amount' => 1000,
+        'total_bet_amount' => 1000,
+        'rebate_rate_snapshot' => 0,
+        'commission_rate_snapshot' => 0,
+        'actual_deduct_amount' => 1000,
+        'odds_snapshot_json' => null,
+        'rule_snapshot_json' => null,
+        'combination_count' => 1,
+        'estimated_max_payout' => 0,
+        'risk_locked_amount' => 0,
+        'status' => 'failed',
+        'fail_reason_code' => 'risk_sold_out',
+        'fail_reason_text' => 'Sold out',
+        'win_amount' => 0,
+        'jackpot_win_amount' => 0,
+        'settled_at' => null,
+    ]);
+
+    TicketItem::query()->create([
+        'ticket_no' => 'TKCSF0004',
+        'order_id' => $order2->id,
+        'player_id' => $player->id,
+        'draw_id' => $draw2->id,
+        'original_number' => '4321',
+        'normalized_number' => '4321',
+        'play_code' => 'small',
+        'dimension' => 4,
+        'digit_slot' => null,
+        'bet_mode' => null,
+        'unit_bet_amount' => 2000,
+        'total_bet_amount' => 2000,
+        'rebate_rate_snapshot' => 0,
+        'commission_rate_snapshot' => 0,
+        'actual_deduct_amount' => 2000,
+        'odds_snapshot_json' => null,
+        'rule_snapshot_json' => null,
+        'combination_count' => 1,
+        'estimated_max_payout' => 0,
+        'risk_locked_amount' => 0,
+        'status' => 'settled_win',
+        'fail_reason_code' => null,
+        'fail_reason_text' => null,
+        'win_amount' => 5000,
+        'jackpot_win_amount' => 1000,
+        'settled_at' => now(),
+    ]);
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->getJson('/api/v1/admin/players/'.$player->id.'/ticket-items?status[]=settled_win')
+        ->assertOk()
+        ->assertJsonPath('data.total', 1)
+        ->assertJsonPath('data.items.0.ticket_no', 'TKCSF0004');
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->getJson('/api/v1/admin/players/'.$player->id.'/ticket-items?number=1234')
+        ->assertOk()
+        ->assertJsonPath('data.total', 1)
+        ->assertJsonPath('data.items.0.ticket_no', 'TKCSF0003');
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->getJson('/api/v1/admin/players/'.$player->id.'/ticket-items?start_date=2026-05-09&end_date=2026-05-11')
+        ->assertOk()
+        ->assertJsonPath('data.total', 1)
+        ->assertJsonPath('data.items.0.ticket_no', 'TKCSF0004');
+});
+
 test('admin draw finance summary aggregates bet and payout', function (): void {
     $token = mintCsFinanceAdminToken();