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