refactor: 使用 ApiMessage 统一错误响应格式

- 在多个控制器中引入 ApiMessage,替换原有的 ApiResponse 错误处理逻辑,确保错误信息的一致性与可读性。
- 更新错误返回信息,使用更具语义的键值,提升 API 的可维护性与用户体验。
- 适配相关控制器的请求参数,确保在处理错误时能够正确返回相应的错误信息。
This commit is contained in:
2026-06-01 14:23:48 +08:00
parent e547e2b4a6
commit e6cf94af46
59 changed files with 518 additions and 230 deletions

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Models\OddsVersion;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
@@ -27,7 +28,7 @@ final class OddsItemsReplaceController extends Controller
if ($version->status !== ConfigVersionStatus::Draft->value) {
return ApiResponse::error(
'version is not draft',
ApiMessage::get($request, 'config_version_not_draft'),
ErrorCode::ConfigVersionNotDraft->value,
null,
400,

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Models\OddsVersion;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -25,7 +26,7 @@ final class OddsVersionDestroyController extends Controller
if ($version->status === ConfigVersionStatus::Active->value) {
return ApiResponse::error(
'cannot delete active config version',
ApiMessage::get($request, 'config_version_cannot_delete_active'),
ErrorCode::ConfigVersionCannotDeleteActive->value,
null,
400,

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Models\OddsVersion;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -26,7 +27,7 @@ final class OddsVersionPublishController extends Controller
if ($version->status !== ConfigVersionStatus::Draft->value) {
return ApiResponse::error(
'version is not draft',
ApiMessage::get($request, 'config_version_not_draft'),
ErrorCode::ConfigVersionNotDraft->value,
null,
400,

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
@@ -27,7 +28,7 @@ final class PlayConfigItemsReplaceController extends Controller
if ($version->status !== ConfigVersionStatus::Draft->value) {
return ApiResponse::error(
'version is not draft',
ApiMessage::get($request, 'config_version_not_draft'),
ErrorCode::ConfigVersionNotDraft->value,
null,
400,

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Models\PlayConfigVersion;
@@ -25,7 +26,7 @@ final class PlayConfigVersionDestroyController extends Controller
if ($version->status === ConfigVersionStatus::Active->value) {
return ApiResponse::error(
'cannot delete active config version',
ApiMessage::get($request, 'config_version_cannot_delete_active'),
ErrorCode::ConfigVersionCannotDeleteActive->value,
null,
400,

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Models\PlayConfigVersion;
@@ -25,12 +26,7 @@ final class PlayConfigVersionPublishController extends Controller
$version = PlayConfigVersion::query()->whereKey($id)->firstOrFail();
if ($version->status !== ConfigVersionStatus::Draft->value) {
return ApiResponse::error(
'version is not draft',
ErrorCode::ConfigVersionNotDraft->value,
null,
400,
);
return ApiMessage::errorResponse($request, 'config_version_not_draft', ErrorCode::ConfigVersionNotDraft->value, null, 400);
}
$service->publish($version, $admin, $request);

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Models\RiskCapVersion;
@@ -26,7 +27,7 @@ final class RiskCapItemsReplaceController extends Controller
if ($version->status !== ConfigVersionStatus::Draft->value) {
return ApiResponse::error(
'version is not draft',
ApiMessage::get($request, 'config_version_not_draft'),
ErrorCode::ConfigVersionNotDraft->value,
null,
400,

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Models\RiskCapVersion;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -25,7 +26,7 @@ final class RiskCapVersionDestroyController extends Controller
if ($version->status === ConfigVersionStatus::Active->value) {
return ApiResponse::error(
'cannot delete active config version',
ApiMessage::get($request, 'config_version_cannot_delete_active'),
ErrorCode::ConfigVersionCannotDeleteActive->value,
null,
400,

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Config;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Models\RiskCapVersion;
@@ -26,7 +27,7 @@ final class RiskCapVersionPublishController extends Controller
if ($version->status !== ConfigVersionStatus::Draft->value) {
return ApiResponse::error(
'version is not draft',
ApiMessage::get($request, 'config_version_not_draft'),
ErrorCode::ConfigVersionNotDraft->value,
null,
400,

View File

@@ -4,7 +4,9 @@ namespace App\Http\Controllers\Api\V1\Admin\Currency;
use App\Models\Currency;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\DB;
use App\Services\LotterySettings;
@@ -12,26 +14,23 @@ use App\Http\Controllers\Controller;
final class AdminCurrencyDestroyController extends Controller
{
public function __invoke(Currency $currency): JsonResponse
public function __invoke(Request $request, Currency $currency): JsonResponse
{
$code = strtoupper((string) $currency->code);
if ($code === LotterySettings::defaultCurrency()) {
return ApiResponse::error(
'默认币种不可删除',
ErrorCode::ValidationFailed->value,
null,
422,
);
return ApiMessage::errorResponse($request, 'admin.currency_default_cannot_delete', ErrorCode::ValidationFailed->value, null, 422);
}
$references = $this->referenceSummary($code);
if ($references !== []) {
return ApiResponse::error(
'该币种已被业务数据引用,暂不可删除:'.implode('、', $references),
return ApiMessage::errorResponse(
$request,
'admin.currency_referenced_cannot_delete',
ErrorCode::ValidationFailed->value,
['references' => $references],
422,
['refs' => implode('、', $references)],
);
}

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api\V1\Admin\Draw;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -20,7 +21,7 @@ final class AdminDrawBatchDestroyController extends Controller
$drawIds = $request->input('draw_ids', []);
if (!is_array($drawIds) || empty($drawIds)) {
return ApiResponse::error(trans('api.invalid_params'), ErrorCode::ClientHttpError->value, [], 400);
return ApiMessage::errorResponse($request, 'invalid_params', ErrorCode::ClientHttpError->value, [], 400);
}
$results = [
@@ -36,17 +37,14 @@ final class AdminDrawBatchDestroyController extends Controller
} catch (\RuntimeException $e) {
$results['failed'][] = [
'id' => $drawId,
'reason' => match ($e->getMessage()) {
'draw_not_deletable' => trans('api.draw_not_deletable'),
'draw_has_bets' => trans('api.draw_has_bets'),
'draw_result_exists' => trans('api.draw_result_exists'),
default => trans('api.client_error'),
},
'reason' => ApiMessage::reason($request, $e->getMessage()),
'reason_key' => $e->getMessage(),
];
} catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
$results['failed'][] = [
'id' => $drawId,
'reason' => trans('api.draw_not_found'),
'reason' => ApiMessage::get($request, 'draw_not_found'),
'reason_key' => 'draw_not_found',
];
}
}

View File

@@ -5,6 +5,8 @@ namespace App\Http\Controllers\Api\V1\Admin\Draw;
use App\Models\Draw;
use App\Lottery\ErrorCode;
use App\Support\ApiResponse;
use App\Support\ApiMessage;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Services\Draw\DrawDestroyService;
@@ -15,19 +17,12 @@ final class AdminDrawDestroyController extends Controller
private readonly DrawDestroyService $service,
) {}
public function __invoke(Draw $draw): JsonResponse
public function __invoke(Request $request, Draw $draw): JsonResponse
{
try {
$this->service->destroy($draw);
} catch (\RuntimeException $e) {
$message = match ($e->getMessage()) {
'draw_not_deletable' => trans('api.draw_not_deletable'),
'draw_has_bets' => trans('api.draw_has_bets'),
'draw_result_exists' => trans('api.draw_result_exists'),
default => trans('api.client_error'),
};
return ApiResponse::error($message, ErrorCode::ClientHttpError->value, ['reason' => $e->getMessage()], 409);
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success(['deleted' => true]);

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Draw;
use App\Lottery\ErrorCode;
use App\Support\ApiResponse;
use App\Support\ApiMessage;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Services\Draw\DrawManualCreateService;
@@ -20,13 +21,7 @@ final class AdminDrawStoreController extends Controller
try {
$draw = $this->service->create($request->validated());
} catch (\RuntimeException $e) {
$message = match ($e->getMessage()) {
'draw_no_exists' => trans('api.draw_no_exists'),
'draw_timeline_invalid' => trans('api.draw_timeline_invalid'),
default => trans('api.client_error'),
};
return ApiResponse::error($message, ErrorCode::ClientHttpError->value, ['reason' => $e->getMessage()], 409);
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success([

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Draw;
use App\Models\Draw;
use App\Lottery\ErrorCode;
use App\Support\ApiResponse;
use App\Support\ApiMessage;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\DrawStoreRequest;
@@ -21,16 +22,7 @@ final class AdminDrawUpdateController extends Controller
try {
$updated = $this->service->update($draw, $request->validated());
} catch (\RuntimeException $e) {
$message = match ($e->getMessage()) {
'draw_no_exists' => trans('api.draw_no_exists'),
'draw_timeline_invalid' => trans('api.draw_timeline_invalid'),
'draw_not_editable' => trans('api.draw_not_editable'),
'draw_has_bets' => trans('api.draw_has_bets'),
'draw_result_exists' => trans('api.draw_result_exists'),
default => trans('api.client_error'),
};
return ApiResponse::error($message, ErrorCode::ClientHttpError->value, ['reason' => $e->getMessage()], 409);
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success([

View File

@@ -4,7 +4,9 @@ namespace App\Http\Controllers\Api\V1\Admin\Draw;
use App\Models\Draw;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Services\Draw\DrawAdminActionService;
@@ -15,12 +17,12 @@ final class DrawCancelController extends Controller
private readonly DrawAdminActionService $service,
) {}
public function __invoke(Draw $draw): JsonResponse
public function __invoke(Request $request, Draw $draw): JsonResponse
{
try {
$cancelled = $this->service->cancelBeforeResult($draw);
} catch (\RuntimeException) {
return ApiResponse::error(trans('api.client_error'), ErrorCode::ClientHttpError->value, null, 409);
} catch (\RuntimeException $e) {
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success([

View File

@@ -4,7 +4,9 @@ namespace App\Http\Controllers\Api\V1\Admin\Draw;
use App\Models\Draw;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Services\Draw\DrawAdminActionService;
@@ -15,12 +17,12 @@ final class DrawManualCloseController extends Controller
private readonly DrawAdminActionService $service,
) {}
public function __invoke(Draw $draw): JsonResponse
public function __invoke(Request $request, Draw $draw): JsonResponse
{
try {
$closed = $this->service->manualClose($draw);
} catch (\RuntimeException) {
return ApiResponse::error(trans('api.client_error'), ErrorCode::ClientHttpError->value, null, 409);
} catch (\RuntimeException $e) {
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success([

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Draw;
use App\Models\Draw;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
@@ -31,13 +32,8 @@ final class DrawManualResultBatchStoreController extends Controller
try {
$batch = $this->service->createPendingBatch($draw, $admin, $request->validated('items'));
} catch (\RuntimeException) {
return ApiResponse::error(
trans('api.client_error', [], $request->lotteryLocale()),
ErrorCode::ClientHttpError->value,
null,
409,
);
} catch (\RuntimeException $e) {
return ApiMessage::runtimeErrorResponse($request, $e);
}
$draw->refresh();

View File

@@ -6,6 +6,7 @@ use App\Models\Draw;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiResponse;
use App\Support\ApiMessage;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Services\Draw\DrawReopenService;
@@ -39,13 +40,8 @@ final class DrawReopenController extends Controller
try {
$reopened = $this->service->reopenCooldownDraw($draw, $admin, $request->validated('reason') ?? null);
} catch (\RuntimeException) {
return ApiResponse::error(
trans('api.client_error', [], $request->lotteryLocale()),
ErrorCode::ClientHttpError->value,
null,
409,
);
} catch (\RuntimeException $e) {
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success([

View File

@@ -6,6 +6,7 @@ use App\Models\Draw;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiResponse;
use App\Support\ApiMessage;
use Illuminate\Http\Request;
use App\Models\DrawResultBatch;
use Illuminate\Http\JsonResponse;
@@ -44,13 +45,8 @@ final class DrawResultBatchPublishController extends Controller
try {
$this->publishService->publishManualBatch($batch, $admin);
} catch (\RuntimeException) {
return ApiResponse::error(
trans('api.client_error', [], $request->lotteryLocale()),
ErrorCode::ClientHttpError->value,
null,
409,
);
} catch (\RuntimeException $e) {
return ApiMessage::runtimeErrorResponse($request, $e);
}
$draw->refresh();

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Draw;
use App\Models\Draw;
use App\Lottery\ErrorCode;
use App\Support\ApiResponse;
use App\Support\ApiMessage;
use App\Lottery\DrawStatus;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
@@ -32,8 +33,8 @@ final class DrawRngRunController extends Controller
return $this->rng->executeLocked($locked);
});
} catch (\RuntimeException) {
return ApiResponse::error(trans('api.client_error'), ErrorCode::ClientHttpError->value, null, 409);
} catch (\RuntimeException $e) {
return ApiMessage::runtimeErrorResponse(request(), $e);
}
$draw->refresh();

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Integration;
use App\Models\AdminSite;
use App\Models\Player;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Lottery\ErrorCode;
use Illuminate\Http\Request;
@@ -24,7 +25,7 @@ final class AdminIntegrationSiteConnectivityTestController extends Controller
abort_if($admin === null, 401);
if (! AdminIntegrationSiteAccess::canAccess($admin, $admin_site)) {
return ApiResponse::error('无权访问该站点', ErrorCode::AdminForbidden->value, null, 403);
return ApiMessage::errorResponse($request, 'admin.site_access_denied', ErrorCode::AdminForbidden->value, null, 403);
}
$sitePlayerId = trim((string) $request->validated('site_player_id'));

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api\V1\Admin\Integration;
use App\Models\AdminSite;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Lottery\ErrorCode;
use Illuminate\Http\Request;
@@ -20,7 +21,7 @@ final class AdminIntegrationSiteExportController extends Controller
abort_if($admin === null, 401);
if (! AdminIntegrationSiteAccess::canAccess($admin, $admin_site)) {
return ApiResponse::error('无权访问该站点', ErrorCode::AdminForbidden->value, null, 403);
return ApiMessage::errorResponse($request, 'admin.site_access_denied', ErrorCode::AdminForbidden->value, null, 403);
}
$sheet = AdminIntegrationSitePresenter::parameterSheet($admin_site);

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api\V1\Admin\Integration;
use App\Models\AdminSite;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Lottery\ErrorCode;
use Illuminate\Http\Request;
@@ -25,7 +26,7 @@ final class AdminIntegrationSiteRotateSecretsController extends Controller
abort_if($admin === null, 401);
if (! AdminIntegrationSiteAccess::canAccess($admin, $admin_site)) {
return ApiResponse::error('无权操作该站点', ErrorCode::AdminForbidden->value, null, 403);
return ApiMessage::errorResponse($request, 'admin.site_rotate_denied', ErrorCode::AdminForbidden->value, null, 403);
}
$result = $service->rotateSecrets($admin_site);

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api\V1\Admin\Integration;
use App\Models\AdminSite;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Lottery\ErrorCode;
use Illuminate\Http\Request;
@@ -19,7 +20,7 @@ final class AdminIntegrationSiteShowController extends Controller
abort_if($admin === null, 401);
if (! AdminIntegrationSiteAccess::canAccess($admin, $admin_site)) {
return ApiResponse::error('无权访问该站点', ErrorCode::AdminForbidden->value, null, 403);
return ApiMessage::errorResponse($request, 'admin.site_access_denied', ErrorCode::AdminForbidden->value, null, 403);
}
return ApiResponse::success(AdminIntegrationSitePresenter::detail($admin_site));

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api\V1\Admin\Integration;
use App\Models\AdminSite;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Lottery\ErrorCode;
use Illuminate\Http\Request;
@@ -26,7 +27,7 @@ final class AdminIntegrationSiteUpdateController extends Controller
abort_if($admin === null, 401);
if (! AdminIntegrationSiteAccess::canAccess($admin, $admin_site)) {
return ApiResponse::error('无权修改该站点', ErrorCode::AdminForbidden->value, null, 403);
return ApiMessage::errorResponse($request, 'admin.site_update_denied', ErrorCode::AdminForbidden->value, null, 403);
}
$before = AdminIntegrationSitePresenter::detail($admin_site);

View File

@@ -6,6 +6,7 @@ use App\Models\JackpotPool;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiResponse;
use App\Support\ApiMessage;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Services\Jackpot\JackpotPoolAdjustmentService;
@@ -44,14 +45,7 @@ final class AdminJackpotPoolAdjustController extends Controller
$request,
);
} catch (\RuntimeException $e) {
$msg = match ($e->getMessage()) {
'adjustment_delta_zero' => trans('jackpot.adjustment_delta_zero', [], $request->lotteryLocale()),
'adjustment_reason_required' => trans('jackpot.adjustment_reason_required', [], $request->lotteryLocale()),
'adjustment_would_make_balance_negative' => trans('jackpot.adjustment_negative_balance', [], $request->lotteryLocale()),
default => trans('api.client_error', [], $request->lotteryLocale()),
};
return ApiResponse::error($msg, ErrorCode::ClientHttpError->value, ['reason' => $e->getMessage()], 422);
return ApiMessage::runtimeErrorResponse($request, $e, ErrorCode::ClientHttpError->value, 422);
}
$pool->refresh();

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Jackpot;
use App\Models\AdminUser;
use App\Models\JackpotPool;
use App\Support\ApiResponse;
use App\Support\ApiMessage;
use App\Lottery\ErrorCode;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -46,7 +47,9 @@ final class AdminJackpotPoolManualBurstController extends Controller
$payload = $this->service->execute($pool, (int) $data['draw_id']);
} catch (\RuntimeException $e) {
return ApiResponse::error(
trans('api.jackpot_manual_burst_failed', ['reason' => $e->getMessage()], $request->lotteryLocale()),
ApiMessage::get($request, 'jackpot_manual_burst_failed', [
'reason' => ApiMessage::reason($request, $e->getMessage()),
]),
ErrorCode::ClientHttpError->value,
['reason' => $e->getMessage()],
409,

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Player;
use App\Models\Player;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -29,12 +30,7 @@ final class AdminPlayerDestroyController extends Controller
->exists();
if ($hasWallets) {
return ApiResponse::error(
'该玩家钱包仍有余额,请先清空后再删除',
ErrorCode::ValidationFailed->value,
null,
422,
);
return ApiMessage::errorResponse($request, 'admin.player_wallet_balance_blocks_delete', ErrorCode::ValidationFailed->value, null, 422);
}
$hasTickets = Player::query()
@@ -43,12 +39,7 @@ final class AdminPlayerDestroyController extends Controller
->exists();
if ($hasTickets) {
return ApiResponse::error(
'该玩家存在注单记录,无法删除',
ErrorCode::ValidationFailed->value,
null,
422,
);
return ApiMessage::errorResponse($request, 'admin.player_has_tickets_blocks_delete', ErrorCode::ValidationFailed->value, null, 422);
}
$player->wallets()->delete();

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Player;
use App\Models\Player;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\JsonResponse;
use App\Support\AdminSiteScope;
@@ -21,12 +22,7 @@ final class AdminPlayerStoreController extends Controller
$siteCode = (string) $request->validated('site_code');
if (! AdminSiteScope::siteCodeAllowed($admin, $siteCode)) {
return ApiResponse::error(
'无权在该站点下创建玩家',
ErrorCode::AdminForbidden->value,
null,
403,
);
return ApiMessage::errorResponse($request, 'admin.player_create_site_forbidden', ErrorCode::AdminForbidden->value, null, 403);
}
$exists = Player::query()
@@ -35,12 +31,7 @@ final class AdminPlayerStoreController extends Controller
->exists();
if ($exists) {
return ApiResponse::error(
'该主站玩家已在彩票平台注册',
ErrorCode::ValidationFailed->value,
null,
422,
);
return ApiMessage::errorResponse($request, 'admin.player_already_registered', ErrorCode::ValidationFailed->value, null, 422);
}
$player = Player::query()->create([

View File

@@ -5,7 +5,9 @@ namespace App\Http\Controllers\Api\V1\Admin\Risk;
use App\Models\Draw;
use App\Models\RiskPool;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Models\RiskPoolLockLog;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\DB;
@@ -17,26 +19,26 @@ final class AdminRiskPoolManualStatusController extends Controller
public function __construct(
private readonly RiskPoolService $riskPoolService,
) {}
public function close(Draw $draw, string $number_4d): JsonResponse
public function close(Request $request, Draw $draw, string $number_4d): JsonResponse
{
$pool = $this->updateStatus($draw, $number_4d, true, 'close', 'admin_manual_close');
if ($pool === null) {
return ApiResponse::error(trans('api.not_found'), ErrorCode::ClientHttpError->value, null, 404);
return ApiMessage::errorResponse($request, 'not_found', ErrorCode::ClientHttpError->value, null, 404);
}
return ApiResponse::success($this->row($pool));
}
public function recover(Draw $draw, string $number_4d): JsonResponse
public function recover(Request $request, Draw $draw, string $number_4d): JsonResponse
{
$pool = $this->updateStatus($draw, $number_4d, false, 'recover', 'admin_manual_recover');
if ($pool === null) {
return ApiResponse::error(trans('api.not_found'), ErrorCode::ClientHttpError->value, null, 404);
return ApiMessage::errorResponse($request, 'not_found', ErrorCode::ClientHttpError->value, null, 404);
}
if ((int) $pool->remaining_amount <= 0) {
return ApiResponse::error(trans('api.client_error'), ErrorCode::ClientHttpError->value, [
return ApiMessage::errorResponse($request, 'risk_pool_no_remaining_amount', ErrorCode::ClientHttpError->value, [
'reason' => 'risk_pool_no_remaining_amount',
], 409);
}

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Settlement;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Models\SettlementBatch;
use Illuminate\Http\JsonResponse;
@@ -24,8 +25,8 @@ final class AdminSettlementBatchApproveController extends Controller
try {
$updated = $this->service->approve($batch, $admin, $request->validated('remark') ?? null);
} catch (\RuntimeException) {
return ApiResponse::error(trans('api.client_error'), ErrorCode::ClientHttpError->value, null, 409);
} catch (\RuntimeException $e) {
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success([

View File

@@ -3,7 +3,9 @@
namespace App\Http\Controllers\Api\V1\Admin\Settlement;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Models\SettlementBatch;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
@@ -13,18 +15,12 @@ final class AdminSettlementBatchPayoutController extends Controller
{
public function __construct(private readonly SettlementBatchWorkflowService $service) {}
public function __invoke(SettlementBatch $batch): JsonResponse
public function __invoke(Request $request, SettlementBatch $batch): JsonResponse
{
try {
$updated = $this->service->payout($batch);
} catch (\RuntimeException $e) {
$reason = $e->getMessage();
$msg = match ($reason) {
'settlement_not_approved' => trans('api.settlement_not_approved'),
default => trans('api.client_error'),
};
return ApiResponse::error($msg, ErrorCode::ClientHttpError->value, ['reason' => $reason], 409);
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success([

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\Settlement;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Models\SettlementBatch;
use Illuminate\Http\JsonResponse;
@@ -24,8 +25,8 @@ final class AdminSettlementBatchRejectController extends Controller
try {
$updated = $this->service->reject($batch, $admin, $request->validated('remark') ?? null);
} catch (\RuntimeException) {
return ApiResponse::error(trans('api.client_error'), ErrorCode::ClientHttpError->value, null, 409);
} catch (\RuntimeException $e) {
return ApiMessage::runtimeErrorResponse($request, $e);
}
return ApiResponse::success([

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\User;
use App\Models\AdminRole;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Services\AuditLogger;
@@ -16,13 +17,13 @@ final class AdminRoleDestroyController extends Controller
public function __invoke(Request $request, AdminRole $admin_role): JsonResponse
{
if ($admin_role->slug === AdminRole::ROLE_SUPER_ADMIN) {
return ApiResponse::error('不能删除超级管理员角色', ErrorCode::ValidationFailed->value, null, 422);
return ApiMessage::errorResponse($request, 'admin.role_cannot_delete_super_admin', ErrorCode::ValidationFailed->value, null, 422);
}
if ((bool) $admin_role->is_system) {
return ApiResponse::error('系统内置角色不允许删除', ErrorCode::ValidationFailed->value, null, 422);
return ApiMessage::errorResponse($request, 'admin.role_builtin_cannot_delete', ErrorCode::ValidationFailed->value, null, 422);
}
if ($admin_role->assignedUserCount() > 0) {
return ApiResponse::error('该角色下仍有关联管理员,不能删除', ErrorCode::ValidationFailed->value, null, 422);
return ApiMessage::errorResponse($request, 'admin.role_has_users_cannot_delete', ErrorCode::ValidationFailed->value, null, 422);
}
$before = AdminRoleApiPresenter::item($admin_role);

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\User;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Services\AuditLogger;
@@ -20,12 +21,7 @@ final class AdminUserDestroyController extends Controller
$actor = $request->lotteryAdmin();
if ((int) $actor->getKey() === (int) $admin_user->getKey()) {
return ApiResponse::error(
'不能删除当前登录账号',
ErrorCode::ValidationFailed->value,
null,
422,
);
return ApiMessage::errorResponse($request, 'admin.user_cannot_delete_self', ErrorCode::ValidationFailed->value, null, 422);
}
$admin_user->load('roles');
@@ -35,12 +31,7 @@ final class AdminUserDestroyController extends Controller
->whereHas('roles', static fn ($q) => $q->where('admin_roles.slug', AdminUser::ROLE_SUPER_ADMIN))
->exists();
if (! $hasOther) {
return ApiResponse::error(
'不能删除最后一个超级管理员',
ErrorCode::ValidationFailed->value,
null,
422,
);
return ApiMessage::errorResponse($request, 'admin.user_cannot_delete_last_super_admin', ErrorCode::ValidationFailed->value, null, 422);
}
}

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\User\Concerns;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -15,12 +16,7 @@ trait EnsuresSuperAdminActor
/** @var AdminUser $actor */
$actor = $request->lotteryAdmin();
if (! $actor->isSuperAdmin()) {
return ApiResponse::error(
'仅超级管理员可管理角色',
ErrorCode::AdminForbidden->value,
null,
403,
);
return ApiMessage::errorResponse($request, 'admin.super_admin_only_for_roles', ErrorCode::AdminForbidden->value, null, 403);
}
return null;

View File

@@ -2,7 +2,9 @@
namespace App\Http\Controllers\Api\V1\Admin\Wallet;
use App\Lottery\ErrorCode;
use App\Models\TransferOrder;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Support\LotteryMessage;
use App\Exceptions\WalletOperationException;
@@ -27,7 +29,7 @@ final class TransferOrderReconcileController extends Controller
{
$order = TransferOrder::query()->where('transfer_no', $transferNo)->first();
if ($order === null) {
return ApiResponse::error(__('wallet.order_not_found'), 404);
return ApiMessage::errorResponse($request, 'wallet.order_not_found', ErrorCode::ClientHttpError->value, null, 404);
}
try {
@@ -52,7 +54,7 @@ final class TransferOrderReconcileController extends Controller
{
$order = TransferOrder::query()->where('transfer_no', $transferNo)->first();
if ($order === null) {
return ApiResponse::error(__('wallet.order_not_found'), 404);
return ApiMessage::errorResponse($request, 'wallet.order_not_found', ErrorCode::ClientHttpError->value, null, 404);
}
try {
@@ -77,7 +79,7 @@ final class TransferOrderReconcileController extends Controller
{
$order = TransferOrder::query()->where('transfer_no', $transferNo)->first();
if ($order === null) {
return ApiResponse::error(__('wallet.order_not_found'), 404);
return ApiMessage::errorResponse($request, 'wallet.order_not_found', ErrorCode::ClientHttpError->value, null, 404);
}
try {

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Api\V1\Play;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -23,20 +24,10 @@ final class PlayEffectiveCatalogController extends Controller
try {
return ApiResponse::success($catalog->build($c));
} catch (ModelNotFoundException) {
return ApiResponse::error(
'effective config not initialized',
ErrorCode::NotFound->value,
null,
404,
);
return ApiMessage::errorResponse($request, 'effective_config_not_initialized', ErrorCode::NotFound->value, null, 404);
} catch (\InvalidArgumentException $e) {
if ($e->getMessage() === 'currency') {
return ApiResponse::error(
'invalid or disabled currency',
ErrorCode::ConfigCurrencyInvalid->value,
null,
400,
);
return ApiMessage::errorResponse($request, 'invalid_or_disabled_currency', ErrorCode::ConfigCurrencyInvalid->value, null, 400);
}
throw $e;

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Setting;
use App\Http\Controllers\Controller;
use App\Models\LotterySetting;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -25,7 +26,8 @@ final class SettingIndexController extends Controller
$group = $request->query('group');
if (! is_string($group) || $group === '' || ! in_array($group, self::PUBLIC_GROUPS, true)) {
return ApiResponse::error(
return ApiMessage::errorResponse(
$request,
'invalid_settings_group',
ErrorCode::ClientHttpError->value,
['allowed_groups' => self::PUBLIC_GROUPS],

View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1\Wallet;
use App\Models\Player;
use App\Lottery\ErrorCode;
use App\Models\PlayerWallet;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Support\CurrencyResolver;
@@ -88,7 +89,7 @@ final class WalletBalanceController extends Controller
if (! CurrencyResolver::isEnabled($code)) {
return ApiResponse::error(
__('wallet.invalid_currency'),
ApiMessage::get($request, 'wallet.invalid_currency'),
ErrorCode::WalletInvalidCurrency->value,
null,
400,

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Wallet;
use App\Models\Player;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Support\LotteryMessage;
use App\Support\CurrencyResolver;
@@ -59,7 +60,7 @@ final class WalletTransferInController extends Controller
if (! CurrencyResolver::isEnabled($code)) {
return ApiResponse::error(
__('wallet.invalid_currency'),
ApiMessage::get($request, 'wallet.invalid_currency'),
ErrorCode::WalletInvalidCurrency->value,
null,
400,

View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Wallet;
use App\Models\Player;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use App\Support\LotteryMessage;
use App\Support\CurrencyResolver;
@@ -59,7 +60,7 @@ final class WalletTransferOutController extends Controller
if (! CurrencyResolver::isEnabled($code)) {
return ApiResponse::error(
__('wallet.invalid_currency'),
ApiMessage::get($request, 'wallet.invalid_currency'),
ErrorCode::WalletInvalidCurrency->value,
null,
400,