xiaokang/lotteryLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 更新玩法配置管理，简化字段并增强功能

Browse Source 
- 将玩法相关的显示名称字段统一为 `display_name`，移除多语言字段。
- 在 `PlayTypePatchController` 中新增即时切换玩法开关的功能，并推送大厅更新。
- 优化多个控制器和服务中的权限检查与数据处理逻辑，提升代码可读性与维护性。
This commit is contained in:
kang
2026-05-25 14:34:24 +08:00
parent 270d2e9af1
commit e27a00f260
74 changed files with 4469 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/V1/Admin/Config/PlayConfigItemsReplaceController.php
View File

@@ -40,9 +40,7 @@ final class PlayConfigItemsReplaceController extends Controller
'items.*.category' => ['required', 'string', 'max:16'],
'items.*.dimension' => ['nullable', 'integer', 'min:0', 'max:255'],
'items.*.bet_mode' => ['nullable', 'string', 'max:32'],
'items.*.display_name_zh' => ['required', 'string', 'max:64'],
'items.*.display_name_en' => ['nullable', 'string', 'max:64'],
'items.*.display_name_ne' => ['nullable', 'string', 'max:64'],
'items.*.display_name' => ['required', 'string', 'max:64'],
'items.*.is_enabled' => ['sometimes', 'boolean'],
'items.*.min_bet_amount' => ['required', 'integer', 'min:0'],
'items.*.max_bet_amount' => ['required', 'integer', 'min:0'],

47
app/Http/Controllers/Api/V1/Admin/Dashboard/AdminDashboardAnalyticsController.php Normal file
View File

@@ -0,0 +1,47 @@
<?php
namespace App\Http\Controllers\Api\V1\Admin\Dashboard;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\DashboardAnalyticsRequest;
use App\Services\Admin\AdminDashboardAnalyticsBuilder;
/**
* GET /api/v1/admin/dashboard/analytics — 可筛选区间的财务趋势与玩法拆解。
*/
final class AdminDashboardAnalyticsController extends Controller
{
public function __construct(
private readonly AdminDashboardAnalyticsBuilder $analytics,
) {}
public function __invoke(DashboardAnalyticsRequest $request): JsonResponse
{
$admin = $request->lotteryAdmin();
if (! $admin instanceof AdminUser) {
return ApiResponse::error(
trans('admin.unauthenticated', [], $request->lotteryLocale()),
ErrorCode::AdminUnauthenticated->value,
null,
401,
);
}
$payload = $this->analytics->build($admin, $request->filters());
if ($payload === null) {
return ApiResponse::error(
trans('admin.forbidden', [], $request->lotteryLocale()),
ErrorCode::AdminForbidden->value,
null,
403,
);
}
return ApiResponse::success($payload);
}
}

78
app/Http/Controllers/Api/V1/Admin/Jackpot/AdminJackpotPoolManualBurstController.php
View File

@@ -2,62 +2,56 @@
namespace App\Http\Controllers\Api\V1\Admin\Jackpot;
use App\Models\AdminUser;
use App\Models\JackpotPool;
use App\Support\ApiResponse;
use App\Lottery\ErrorCode;
use Illuminate\Http\Request;
use App\Models\JackpotPayoutLog;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
use App\Services\Jackpot\JackpotManualBurstService;
final class AdminJackpotPoolManualBurstController extends Controller
{
public function __construct(
private readonly JackpotManualBurstService $service,
) {}
public function __invoke(Request $request, JackpotPool $pool): JsonResponse
{
$admin = $request->user();
if (! $admin instanceof AdminUser) {
return ApiResponse::error(
trans('admin.unauthenticated', [], $request->lotteryLocale()),
ErrorCode::AdminUnauthenticated->value,
null,
401,
);
}
if (! $admin->isSuperAdmin()) {
return ApiResponse::error(
trans('admin.permission_denied', [], $request->lotteryLocale()),
ErrorCode::AdminForbidden->value,
['required_any' => [AdminUser::ROLE_SUPER_ADMIN]],
403,
);
}
$data = $request->validate([
'draw_id' => 'required|integer|exists:draws,id',
'amount' => 'nullable|integer|min:1',
]);
$payload = DB::transaction(function () use ($pool, $data): array {
/** @var JackpotPool $locked */
$locked = JackpotPool::query()->whereKey($pool->id)->lockForUpdate()->firstOrFail();
$poolBefore = (int) $locked->current_amount;
$amount = isset($data['amount']) ? min((int) $data['amount'], $poolBefore) : $poolBefore;
if ($amount <= 0) {
return [
'current_amount' => $poolBefore,
'burst_amount' => 0,
'log_id' => null,
];
}
$drawId = (int) $data['draw_id'];
$locked->forceFill([
'current_amount' => $poolBefore - $amount,
'last_trigger_draw_id' => $drawId,
])->save();
$log = JackpotPayoutLog::query()->create([
'draw_id' => $drawId,
'jackpot_pool_id' => $locked->id,
'trigger_type' => 'manual',
'total_payout_amount' => $amount,
'winner_count' => 0,
'trigger_snapshot_json' => [
'pool_amount_before' => $poolBefore,
'manual' => true,
],
]);
return [
'current_amount' => (int) $locked->current_amount,
'burst_amount' => $amount,
'log_id' => (int) $log->id,
];
});
try {
$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()),
ErrorCode::ClientHttpError->value,
['reason' => $e->getMessage()],
409,
);
}
return ApiResponse::success($payload);
}

24
app/Http/Controllers/Api/V1/Admin/PlayTypePatchController.php
View File

@@ -3,30 +3,46 @@
namespace App\Http\Controllers\Api\V1\Admin;
use App\Models\PlayType;
use App\Models\AdminUser;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Support\AdminConfigPresenter;
use App\Services\Config\PlayConfigStreamService;
/** PATCH /api/v1/admin/play-types/{play_code} — 主目录层开关与展示名（不等同于版本化 items）。 */
/**
* PATCH /api/v1/admin/play-types/{play_code}
*
* is_enabled 写入当前生效玩法配置并即时推送大厅；其余字段仅更新主目录 play_types。
*/
final class PlayTypePatchController extends Controller
{
public function __construct(
private readonly PlayConfigStreamService $playConfig,
) {}
public function __invoke(Request $request, string $play_code): JsonResponse
{
/** @var AdminUser $admin */
$admin = $request->lotteryAdmin();
/** @var PlayType $type */
$type = PlayType::query()->where('play_code', $play_code)->firstOrFail();
$data = $request->validate([
'is_enabled' => ['sometimes', 'boolean'],
'sort_order' => ['sometimes', 'integer'],
'display_name_zh' => ['sometimes', 'nullable', 'string', 'max:64'],
'display_name_en' => ['sometimes', 'nullable', 'string', 'max:64'],
'display_name_ne' => ['sometimes', 'nullable', 'string', 'max:64'],
'display_name' => ['sometimes', 'nullable', 'string', 'max:64'],
'supports_multi_number' => ['sometimes', 'boolean'],
'reserved_rule_json' => ['sometimes', 'nullable', 'array'],
]);
if (array_key_exists('is_enabled', $data)) {
$this->playConfig->patchActivePlayToggle($admin, $play_code, (bool) $data['is_enabled'], $request);
unset($data['is_enabled']);
}
if ($data !== []) {
$type->fill($data);
$type->save();

16
app/Http/Controllers/Api/V1/Admin/Wallet/TransferOrderListController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Api\V1\Admin\Wallet;
use App\Models\AdminUser;
use App\Support\ApiResponse;
use App\Models\TransferOrder;
use App\Support\PaginationTrait;
@@ -80,8 +81,11 @@ final class TransferOrderListController extends Controller
}
}
$admin = $request->lotteryAdmin();
$paginator = $query->paginate($perPage, ['*'], 'page', $page);
$items = $paginator->getCollection()->map(fn (TransferOrder $o) => $this->formatRow($o));
$items = $paginator->getCollection()->map(
fn (TransferOrder $o) => $this->formatRow($o, $admin instanceof AdminUser ? $admin : null),
);
return ApiResponse::success([
'items' => $items,
@@ -94,10 +98,14 @@ final class TransferOrderListController extends Controller
/**
* @return array<string, mixed>
*/
private function formatRow(TransferOrder $o): array
private function formatRow(TransferOrder $o, ?AdminUser $admin): array
{
$p = $o->player;
$amount = (int) $o->amount;
$canWriteWallet = $admin !== null && (
$admin->hasAdminPermission('prd.wallet_adjust.manage')
|| $admin->hasAdminPermission('prd.wallet_reconcile.manage')
);
return [
'id' => $o->id,
@@ -113,8 +121,8 @@ final class TransferOrderListController extends Controller
'amount_formatted' => CurrencyFormatter::fromMinor($amount),
'idempotent_key' => $o->idempotent_key,
'status' => $o->status,
'can_reverse' => $o->status === 'pending_reconcile',
'can_manually_process' => in_array($o->status, ['processing', 'failed', 'pending_reconcile'], true),
'can_reverse' => $canWriteWallet && $o->status === 'pending_reconcile',
'can_manually_process' => $canWriteWallet && in_array($o->status, ['processing', 'failed', 'pending_reconcile'], true),
'external_ref_no' => $o->external_ref_no,
'external_request_payload' => $o->external_request_payload,
'external_response_payload' => $o->external_response_payload,