xiaokang/lotteryLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor：用 AdminApiList 统一后台列表类接口的响应格式

Browse Source
This commit is contained in:
kang
2026-05-13 11:36:24 +08:00
parent edd863764b
commit 5d2dbdbe1d
29 changed files with 622 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/Http/Controllers/Api/V1/Admin/Settlement/AdminSettlementBatchDetailsController.php
View File

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Settlement;
use App\Http\Controllers\Controller;
use App\Models\SettlementBatch;
use App\Models\TicketSettlementDetail;
use App\Support\ApiResponse;
use App\Support\AdminApiList;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -16,8 +16,7 @@ final class AdminSettlementBatchDetailsController extends Controller
{
public function __invoke(Request $request, SettlementBatch $batch): JsonResponse
{
$perPage = min(max((int) $request->integer('per_page', 25), 1), 100);
$page = max((int) $request->integer('page', 1), 1);
$p = AdminApiList::readPaging($request);
$paginator = TicketSettlementDetail::query()
->where('settlement_batch_id', $batch->id)
@@ -26,36 +25,27 @@ final class AdminSettlementBatchDetailsController extends Controller
'ticketItem.player:id,username,site_player_id',
])
->orderBy('id')
->paginate($perPage, ['*'], 'page', $page);
->paginate($p['perPage'], ['*'], 'page', $p['page']);
return ApiResponse::success([
'batch_id' => (int) $batch->id,
'items' => collect($paginator->items())->map(function ($row) {
/** @var TicketSettlementDetail $row */
$item = $row->ticketItem;
$player = $item?->player;
return AdminApiList::jsonWith($paginator, function ($row) {
/** @var TicketSettlementDetail $row */
$item = $row->ticketItem;
$player = $item?->player;
return [
'id' => (int) $row->id,
'ticket_item_id' => (int) $row->ticket_item_id,
'ticket_no' => $item?->ticket_no,
'play_code' => $item?->play_code,
'player_id' => $item?->player_id,
'player_username' => $player?->username,
'site_player_id' => $player?->site_player_id,
'matched_prize_tier' => $row->matched_prize_tier,
'win_amount' => (int) $row->win_amount,
'jackpot_allocation_amount' => (int) $row->jackpot_allocation_amount,
'match_detail_json' => $row->match_detail_json,
'created_at' => $row->created_at?->toIso8601String(),
];
})->all(),
'meta' => [
'current_page' => $paginator->currentPage(),
'per_page' => $paginator->perPage(),
'total' => $paginator->total(),
'last_page' => $paginator->lastPage(),
],
]);
return [
'id' => (int) $row->id,
'ticket_item_id' => (int) $row->ticket_item_id,
'ticket_no' => $item?->ticket_no,
'play_code' => $item?->play_code,
'player_id' => $item?->player_id,
'player_username' => $player?->username,
'site_player_id' => $player?->site_player_id,
'matched_prize_tier' => $row->matched_prize_tier,
'win_amount' => (int) $row->win_amount,
'jackpot_allocation_amount' => (int) $row->jackpot_allocation_amount,
'match_detail_json' => $row->match_detail_json,
'created_at' => $row->created_at?->toIso8601String(),
];
}, ['batch_id' => (int) $batch->id]);
}
}