refactor:用 AdminApiList 统一后台列表类接口的响应格式
This commit is contained in:
@@ -4,8 +4,9 @@ namespace App\Http\Controllers\Api\V1\Admin\Draw;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Draw;
|
||||
use App\Support\ApiResponse;
|
||||
use App\Support\AdminApiList;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
@@ -16,7 +17,7 @@ final class AdminDrawIndexController extends Controller
|
||||
{
|
||||
public function __invoke(Request $request): JsonResponse
|
||||
{
|
||||
$perPage = min(max((int) $request->integer('per_page', 25), 1), 100);
|
||||
$p = AdminApiList::readPaging($request);
|
||||
$drawNo = trim((string) $request->query('draw_no', ''));
|
||||
$status = trim((string) $request->query('status', ''));
|
||||
|
||||
@@ -30,18 +31,10 @@ final class AdminDrawIndexController extends Controller
|
||||
$q->where('status', $status);
|
||||
}
|
||||
|
||||
/** @var \Illuminate\Contracts\Pagination\LengthAwarePaginator $paginator */
|
||||
$paginator = $q->paginate($perPage);
|
||||
/** @var LengthAwarePaginator $paginator */
|
||||
$paginator = $q->paginate($p['perPage'], ['*'], 'page', $p['page']);
|
||||
|
||||
return ApiResponse::success([
|
||||
'items' => collect($paginator->items())->map(fn (Draw $row) => $this->row($row))->all(),
|
||||
'meta' => [
|
||||
'current_page' => $paginator->currentPage(),
|
||||
'per_page' => $paginator->perPage(),
|
||||
'total' => $paginator->total(),
|
||||
'last_page' => $paginator->lastPage(),
|
||||
],
|
||||
]);
|
||||
return AdminApiList::json($paginator, fn (Draw $row) => $this->row($row));
|
||||
}
|
||||
|
||||
/** @return array<string, mixed> */
|
||||
|
||||
Reference in New Issue
Block a user