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

32
app/Http/Controllers/Api/V1/Admin/Reconcile/ReconcileItemIndexController.php
View File

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Reconcile;
use App\Http\Controllers\Controller;
use App\Models\ReconcileItem;
use App\Models\ReconcileJob;
use App\Support\ApiResponse;
use App\Support\AdminApiList;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -14,31 +14,23 @@ final class ReconcileItemIndexController extends Controller
{
public function __invoke(Request $request, ReconcileJob $reconcile_job): JsonResponse
{
$perPage = min(max((int) $request->integer('per_page', 50), 1), 200);
$page = max((int) $request->integer('page', 1), 1);
$p = AdminApiList::readPaging($request, 50, 200);
$paginator = $reconcile_job->items()
->orderBy('id')
->paginate($perPage, ['*'], 'page', $page);
->paginate($p['perPage'], ['*'], 'page', $p['page']);
return ApiResponse::success([
return AdminApiList::jsonWith($paginator, fn (ReconcileItem $r) => [
'id' => (int) $r->id,
'side_a_ref' => $r->side_a_ref,
'side_b_ref' => $r->side_b_ref,
'difference_amount' => (int) $r->difference_amount,
'status' => $r->status,
'resolved_at' => $r->resolved_at?->toIso8601String(),
'created_at' => $r->created_at?->toIso8601String(),
], [
'job_id' => (int) $reconcile_job->id,
'job_no' => $reconcile_job->job_no,
'items' => collect($paginator->items())->map(fn (ReconcileItem $r) => [
'id' => (int) $r->id,
'side_a_ref' => $r->side_a_ref,
'side_b_ref' => $r->side_b_ref,
'difference_amount' => (int) $r->difference_amount,
'status' => $r->status,
'resolved_at' => $r->resolved_at?->toIso8601String(),
'created_at' => $r->created_at?->toIso8601String(),
])->all(),
'meta' => [
'current_page' => $paginator->currentPage(),
'per_page' => $paginator->perPage(),
'total' => $paginator->total(),
'last_page' => $paginator->lastPage(),
],
]);
}
}

17
app/Http/Controllers/Api/V1/Admin/Reconcile/ReconcileJobIndexController.php
View File

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Reconcile;
use App\Http\Controllers\Controller;
use App\Models\ReconcileJob;
use App\Support\ApiResponse;
use App\Support\AdminApiList;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -13,8 +13,7 @@ final class ReconcileJobIndexController extends Controller
{
public function __invoke(Request $request): JsonResponse
{
$perPage = min(max((int) $request->integer('per_page', 25), 1), 100);
$page = max((int) $request->integer('page', 1), 1);
$p = AdminApiList::readPaging($request);
$type = trim((string) $request->query('reconcile_type', ''));
$q = ReconcileJob::query()->orderByDesc('id');
@@ -22,17 +21,9 @@ final class ReconcileJobIndexController extends Controller
$q->where('reconcile_type', $type);
}
$paginator = $q->paginate($perPage, ['*'], 'page', $page);
$paginator = $q->paginate($p['perPage'], ['*'], 'page', $p['page']);
return ApiResponse::success([
'items' => collect($paginator->items())->map(fn (ReconcileJob $j) => $this->row($j))->all(),
'meta' => [
'current_page' => $paginator->currentPage(),
'per_page' => $paginator->perPage(),
'total' => $paginator->total(),
'last_page' => $paginator->lastPage(),
],
]);
return AdminApiList::json($paginator, fn (ReconcileJob $j) => $this->row($j));
}
/** @return array<string, mixed> */