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

15
app/Http/Controllers/Api/V1/Admin/Risk/AdminRiskPoolIndexController.php
View File

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Risk;
use App\Http\Controllers\Controller;
use App\Models\Draw;
use App\Models\RiskPool;
use App\Support\ApiResponse;
use App\Support\AdminApiList;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -19,7 +19,7 @@ final class AdminRiskPoolIndexController extends Controller
{
public function __invoke(Request $request, Draw $draw): JsonResponse
{
$perPage = min(max((int) $request->integer('per_page', 25), 1), 100);
$p = AdminApiList::readPaging($request);
$soldOutOnly = $request->boolean('sold_out_only');
$sort = trim((string) $request->query('sort', 'usage_desc'));
@@ -39,18 +39,11 @@ final class AdminRiskPoolIndexController extends Controller
};
/** @var LengthAwarePaginator $paginator */
$paginator = $q->paginate($perPage);
$paginator = $q->paginate($p['perPage'], ['*'], 'page', $p['page']);
return ApiResponse::success([
return AdminApiList::jsonWith($paginator, fn (RiskPool $row) => $this->row($row), [
'draw_id' => (int) $draw->id,
'draw_no' => $draw->draw_no,
'items' => collect($paginator->items())->map(fn (RiskPool $row) => $this->row($row))->all(),
'meta' => [
'current_page' => $paginator->currentPage(),
'per_page' => $paginator->perPage(),
'total' => $paginator->total(),
'last_page' => $paginator->lastPage(),
],
]);
}

15
app/Http/Controllers/Api/V1/Admin/Risk/AdminRiskPoolLockLogIndexController.php
View File

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Risk;
use App\Http\Controllers\Controller;
use App\Models\Draw;
use App\Models\RiskPoolLockLog;
use App\Support\ApiResponse;
use App\Support\AdminApiList;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -17,7 +17,7 @@ final class AdminRiskPoolLockLogIndexController extends Controller
{
public function __invoke(Request $request, Draw $draw): JsonResponse
{
$perPage = min(max((int) $request->integer('per_page', 25), 1), 100);
$p = AdminApiList::readPaging($request);
$action = trim((string) $request->query('action_type', ''));
$number = trim((string) $request->query('normalized_number', ''));
@@ -36,18 +36,11 @@ final class AdminRiskPoolLockLogIndexController extends Controller
}
/** @var LengthAwarePaginator $paginator */
$paginator = $q->paginate($perPage);
$paginator = $q->paginate($p['perPage'], ['*'], 'page', $p['page']);
return ApiResponse::success([
return AdminApiList::jsonWith($paginator, fn (RiskPoolLockLog $log) => $this->row($log), [
'draw_id' => (int) $draw->id,
'draw_no' => $draw->draw_no,
'items' => collect($paginator->items())->map(fn (RiskPoolLockLog $log) => $this->row($log))->all(),
'meta' => [
'current_page' => $paginator->currentPage(),
'per_page' => $paginator->perPage(),
'total' => $paginator->total(),
'last_page' => $paginator->lastPage(),
],
]);
}

15
app/Http/Controllers/Api/V1/Admin/Risk/AdminRiskPoolShowController.php
View File

@@ -7,6 +7,7 @@ use App\Lottery\ErrorCode;
use App\Models\Draw;
use App\Models\RiskPool;
use App\Models\RiskPoolLockLog;
use App\Support\AdminApiList;
use App\Support\ApiResponse;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Http\JsonResponse;
@@ -32,7 +33,7 @@ final class AdminRiskPoolShowController extends Controller
return ApiResponse::error('该期尚无此号码的风险池记录', ErrorCode::NotFound->value, null, 404);
}
$perPage = min(max((int) $request->integer('per_page', 20), 1), 100);
$p = AdminApiList::readPaging($request, 20, AdminApiList::MAX_PER_PAGE);
/** @var LengthAwarePaginator $paginator */
$paginator = RiskPoolLockLog::query()
@@ -41,7 +42,7 @@ final class AdminRiskPoolShowController extends Controller
->with(['ticketItem:id,ticket_no,play_code,player_id'])
->orderByDesc('created_at')
->orderByDesc('id')
->paginate($perPage);
->paginate($p['perPage'], ['*'], 'page', $p['page']);
$cap = (int) $pool->total_cap_amount;
$locked = (int) $pool->locked_amount;
@@ -59,15 +60,7 @@ final class AdminRiskPoolShowController extends Controller
'usage_ratio' => $cap > 0 ? round($locked / $cap, 6) : null,
'version' => (int) $pool->version,
],
'logs' => [
'items' => collect($paginator->items())->map(fn (RiskPoolLockLog $log) => $this->logRow($log))->all(),
'meta' => [
'current_page' => $paginator->currentPage(),
'per_page' => $paginator->perPage(),
'total' => $paginator->total(),
'last_page' => $paginator->lastPage(),
],
],
'logs' => AdminApiList::payload($paginator, fn (RiskPoolLockLog $log) => $this->logRow($log)),
]);
}