refactor:用 AdminApiList 统一后台列表类接口的响应格式
This commit is contained in:
@@ -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)),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user