feat: 添加删除待审核开奖批次功能及相关错误信息

- 在 AdminAuthorizationRegistry 中新增删除待审核开奖批次的权限定义。 - 更新 API 路由以支持删除待审核开奖批次的请求。 - 在多语言文件中添加相关错误信息，确保用户在删除操作中获得清晰的反馈。 - 增加测试用例，验证管理员能够成功删除待审核的开奖批次并返回正确状态。
2026-06-01 15:37:33 +08:00
parent e6cf94af46
commit b13776b480
8 changed files with 181 additions and 0 deletions
--- a/app/Http/Controllers/Api/V1/Admin/Draw/DrawResultBatchDestroyController.php
+++ b/app/Http/Controllers/Api/V1/Admin/Draw/DrawResultBatchDestroyController.php
@@ -0,0 +1,47 @@
+<?php
+
+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 App\Models\DrawResultBatch;
+use Illuminate\Http\JsonResponse;
+use App\Http\Controllers\Controller;
+use App\Services\Draw\DrawPendingResultBatchDiscardService;
+
+/**
+ * DELETE /api/v1/admin/draws/{draw}/result-batches/{batch} — 删除待审核开奖批次。
+ */
+final class DrawResultBatchDestroyController extends Controller
+{
+    public function __construct(
+        private readonly DrawPendingResultBatchDiscardService $discardService,
+    ) {}
+
+    public function __invoke(Request $request, Draw $draw, DrawResultBatch $batch): JsonResponse
+    {
+        if ((int) $batch->draw_id !== (int) $draw->id) {
+            return ApiResponse::error(
+                trans('api.not_found', [], $request->lotteryLocale()),
+                ErrorCode::NotFound->value,
+                null,
+                404,
+            );
+        }
+
+        try {
+            $draw = $this->discardService->discard($draw, $batch);
+        } catch (\RuntimeException $e) {
+            return ApiMessage::runtimeErrorResponse($request, $e);
+        }
+
+        return ApiResponse::success([
+            'draw_no' => $draw->draw_no,
+            'status' => $draw->status,
+            'deleted_batch_id' => (int) $batch->id,
+        ]);
+    }
+}
--- a/app/Services/Draw/DrawPendingResultBatchDiscardService.php
+++ b/app/Services/Draw/DrawPendingResultBatchDiscardService.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Services\Draw;
+
+use App\Models\Draw;
+use App\Models\DrawResultBatch;
+use App\Lottery\DrawStatus;
+use Illuminate\Support\Facades\DB;
+use App\Lottery\DrawResultBatchStatus;
+use App\Models\SettlementBatch;
+
+/**
+ * 删除待审核开奖批次，便于作废草稿后重新录入或重新 RNG。
+ */
+final class DrawPendingResultBatchDiscardService
+{
+    public function discard(Draw $draw, DrawResultBatch $batch): Draw
+    {
+        return DB::transaction(function () use ($draw, $batch): Draw {
+            /** @var DrawResultBatch $lockedBatch */
+            $lockedBatch = DrawResultBatch::query()->whereKey($batch->id)->lockForUpdate()->firstOrFail();
+
+            if ((int) $lockedBatch->draw_id !== (int) $draw->id) {
+                throw new \RuntimeException('batch_draw_mismatch');
+            }
+
+            if ($lockedBatch->status !== DrawResultBatchStatus::PendingReview->value) {
+                throw new \RuntimeException('batch_not_pending_review');
+            }
+
+            if (SettlementBatch::query()->where('result_batch_id', $lockedBatch->id)->exists()) {
+                throw new \RuntimeException('batch_linked_to_settlement');
+            }
+
+            /** @var Draw $lockedDraw */
+            $lockedDraw = Draw::query()->whereKey($draw->id)->lockForUpdate()->firstOrFail();
+
+            $lockedBatch->delete();
+
+            if ($lockedDraw->status === DrawStatus::Review->value) {
+                $stillPending = DrawResultBatch::query()
+                    ->where('draw_id', $lockedDraw->id)
+                    ->where('status', DrawResultBatchStatus::PendingReview->value)
+                    ->exists();
+
+                if (! $stillPending) {
+                    $hasPublished = DrawResultBatch::query()
+                        ->where('draw_id', $lockedDraw->id)
+                        ->where('status', DrawResultBatchStatus::Published->value)
+                        ->exists();
+
+                    $lockedDraw->forceFill([
+                        'status' => DrawStatus::Closed->value,
+                        'result_source' => $hasPublished ? $lockedDraw->result_source : null,
+                    ])->save();
+                }
+            }
+
+            return $lockedDraw->refresh();
+        });
+    }
+}
--- a/app/Support/AdminAuthorizationRegistry.php
+++ b/app/Support/AdminAuthorizationRegistry.php
@@ -410,6 +410,7 @@ final class AdminAuthorizationRegistry
            ['code' => 'admin.draws.risk-pools.show', 'module_code' => 'risk', 'name' => '风控池详情', 'http_method' => 'GET', 'uri_pattern' => '/api/v1/admin/draws/{draw}/risk-pools/{number_4d}', 'route_name' => 'api.v1.admin.draws.risk-pools.show', 'auth_mode' => 'permission_required', 'is_audit_required' => false, 'legacy_permission_slugs' => ['prd.draw_result.manage', 'prd.draw_result.view', 'prd.risk.view', 'prd.risk.manage']],
            ['code' => 'admin.draws.result-batches.store', 'module_code' => 'draw', 'name' => '创建开奖结果批次', 'http_method' => 'POST', 'uri_pattern' => '/api/v1/admin/draws/{draw}/result-batches', 'route_name' => 'api.v1.admin.draws.result-batches.store', 'auth_mode' => 'permission_required', 'is_audit_required' => true, 'legacy_permission_slugs' => ['prd.draw_result.manage']],
            ['code' => 'admin.draws.result-batches.publish', 'module_code' => 'draw', 'name' => '发布开奖结果批次', 'http_method' => 'POST', 'uri_pattern' => '/api/v1/admin/draws/{draw}/result-batches/{batch}/publish', 'route_name' => 'api.v1.admin.draws.result-batches.publish', 'auth_mode' => 'permission_required', 'is_audit_required' => true, 'legacy_permission_slugs' => ['prd.draw_result.manage']],
+            ['code' => 'admin.draws.result-batches.destroy', 'module_code' => 'draw', 'name' => '删除待审核开奖批次', 'http_method' => 'DELETE', 'uri_pattern' => '/api/v1/admin/draws/{draw}/result-batches/{batch}', 'route_name' => 'api.v1.admin.draws.result-batches.destroy', 'auth_mode' => 'permission_required', 'is_audit_required' => true, 'legacy_permission_slugs' => ['prd.draw_result.manage']],
            ['code' => 'admin.draws.reopen', 'module_code' => 'draw', 'name' => '重开开奖', 'http_method' => 'POST', 'uri_pattern' => '/api/v1/admin/draws/{draw}/reopen', 'route_name' => 'api.v1.admin.draws.reopen', 'auth_mode' => 'permission_required', 'is_audit_required' => true, 'legacy_permission_slugs' => ['prd.draw_reopen.manage']],
            ['code' => 'admin.draws.generate-plan', 'module_code' => 'draw', 'name' => '生成开奖计划', 'http_method' => 'POST', 'uri_pattern' => '/api/v1/admin/draws/generate-plan', 'route_name' => 'api.v1.admin.draws.generate-plan', 'auth_mode' => 'permission_required', 'is_audit_required' => true, 'legacy_permission_slugs' => ['prd.draw_result.manage']],
            ['code' => 'admin.draws.store', 'module_code' => 'draw', 'name' => '手动创建期号', 'http_method' => 'POST', 'uri_pattern' => '/api/v1/admin/draws', 'route_name' => 'api.v1.admin.draws.store', 'auth_mode' => 'permission_required', 'is_audit_required' => true, 'legacy_permission_slugs' => ['prd.draw_result.manage']],
--- a/lang/en/api.php
+++ b/lang/en/api.php
@@ -40,6 +40,8 @@ return [
        'settlement_not_approved' => 'Settlement batch is not approved.',
        'draw_has_unsettled_tickets' => 'This draw still has unsettled tickets.',
        'batch_not_pending_review' => 'Result batch is not pending review.',
+        'batch_draw_mismatch' => 'Result batch does not belong to this draw.',
+        'batch_linked_to_settlement' => 'This result batch is linked to settlement and cannot be deleted.',
        'draw_not_ready_to_publish' => 'Draw is not ready to publish results.',
        'batch_result_version_stale' => 'Result batch version is stale. Refresh and try again.',
        'draw_settlement_in_progress' => 'Settlement is in progress for this draw.',
--- a/lang/ne/api.php
+++ b/lang/ne/api.php
@@ -40,6 +40,8 @@ return [
        'settlement_not_approved' => 'सेटलमेन्ट ब्याच स्वीकृत छैन।',
        'draw_has_unsettled_tickets' => 'यो ड्रमा अझै नसेटल टिकट छ।',
        'batch_not_pending_review' => 'नतिजा ब्याच समीक्षामा छैन।',
+        'batch_draw_mismatch' => 'नतिजा ब्याच यो ड्रअसँग मेल खाँदैन।',
+        'batch_linked_to_settlement' => 'यो नतिजा ब्याच सेटलमेन्टसँग जोडिएको छ, मेटाउन मिल्दैन।',
        'draw_not_ready_to_publish' => 'ड्र नतिजा प्रकाशित गर्न तयार छैन।',
        'batch_result_version_stale' => 'नतिजा संस्करण पुरानो भयो। रिफ्रेस गरेर पुन: प्रयास गर्नुहोस्।',
        'draw_settlement_in_progress' => 'यो ड्रको सेटलमेन्ट चलिरहेको छ।',
--- a/lang/zh/api.php
+++ b/lang/zh/api.php
@@ -40,6 +40,8 @@ return [
        'settlement_not_approved' => '结算批次尚未审核通过。',
        'draw_has_unsettled_tickets' => '该期仍有未结算注单。',
        'batch_not_pending_review' => '开奖结果批次不在待审核状态。',
+        'batch_draw_mismatch' => '开奖批次与期号不匹配。',
+        'batch_linked_to_settlement' => '该开奖批次已关联结算，无法删除。',
        'draw_not_ready_to_publish' => '期号状态不允许发布开奖结果。',
        'batch_result_version_stale' => '开奖结果版本已过期，请刷新后重试。',
        'draw_settlement_in_progress' => '该期正在结算中，无法发布结果。',
--- a/routes/api/v1/admin/draw.php
+++ b/routes/api/v1/admin/draw.php
@@ -17,6 +17,7 @@ use App\Http\Controllers\Api\V1\Admin\Risk\AdminRiskPoolShowController;
 use App\Http\Controllers\Api\V1\Admin\Risk\AdminRiskPoolIndexController;
 use App\Http\Controllers\Api\V1\Admin\Risk\AdminRiskPoolManualStatusController;
 use App\Http\Controllers\Api\V1\Admin\Draw\DrawResultBatchPublishController;
+use App\Http\Controllers\Api\V1\Admin\Draw\DrawResultBatchDestroyController;
 use App\Http\Controllers\Api\V1\Admin\Draw\AdminDrawFinanceSummaryController;
 use App\Http\Controllers\Api\V1\Admin\Risk\AdminRiskPoolLockLogIndexController;
 use App\Http\Controllers\Api\V1\Admin\Draw\AdminDrawResultBatchesIndexController;
@@ -60,6 +61,8 @@ Route::middleware('admin.api-resource')
            ->name('api.v1.admin.draws.result-batches.store');
        Route::post('draws/{draw}/result-batches/{batch}/publish', DrawResultBatchPublishController::class)
            ->name('api.v1.admin.draws.result-batches.publish');
+        Route::delete('draws/{draw}/result-batches/{batch}', DrawResultBatchDestroyController::class)
+            ->name('api.v1.admin.draws.result-batches.destroy');
        Route::post('draws/{draw}/reopen', DrawReopenController::class)
            ->name('api.v1.admin.draws.reopen');
        Route::post('draws/generate-plan', DrawPlanGenerateController::class)
--- a/tests/Feature/DrawPipelineTest.php
+++ b/tests/Feature/DrawPipelineTest.php
@@ -640,6 +640,68 @@ test('admin can create manual result batch with 23 numbers for review', function
    Carbon::setTestNow();
 });

+test('admin can discard pending manual result batch and draw returns to closed', function (): void {
+    Carbon::setTestNow(Carbon::parse('2026-05-09 14:25:00', 'UTC'));
+
+    $draw = Draw::query()->create([
+        'draw_no' => '20260509-221',
+        'business_date' => '2026-05-09',
+        'sequence_no' => 221,
+        'status' => DrawStatus::Closed->value,
+        'start_time' => now()->copy()->subMinutes(20),
+        'close_time' => now()->copy()->subMinutes(2),
+        'draw_time' => now()->copy()->subMinute(),
+        'cooling_end_time' => null,
+        'result_source' => null,
+        'current_result_version' => 0,
+        'settle_version' => 0,
+        'is_reopened' => false,
+    ]);
+
+    $admin = AdminUser::query()->create([
+        'username' => 'discard_batch_admin',
+        'name' => 'Discard Batch Admin',
+        'email' => null,
+        'password' => Hash::make('secret-strong'),
+        'status' => 0,
+    ]);
+    grantSuperAdminRole($admin);
+    $token = $admin->createToken('test', ['*'], now()->addDay())->plainTextToken;
+
+    $items = [];
+    foreach (array_values(App\Services\Draw\DrawPrizeLayout::slots()) as $i => $slot) {
+        $items[] = [
+            'prize_type' => $slot['prize_type'],
+            'prize_index' => $slot['prize_index'],
+            'number_4d' => str_pad((string) ($i + 11), 4, '0', STR_PAD_LEFT),
+        ];
+    }
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->postJson("/api/v1/admin/draws/{$draw->id}/result-batches", ['items' => $items])
+        ->assertOk();
+
+    $batchId = (int) DrawResultBatch::query()->where('draw_id', $draw->id)->value('id');
+    expect($batchId)->toBeGreaterThan(0);
+
+    $draw->refresh();
+    expect($draw->status)->toBe(DrawStatus::Review->value);
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->deleteJson("/api/v1/admin/draws/{$draw->id}/result-batches/{$batchId}")
+        ->assertOk()
+        ->assertJsonPath('data.status', DrawStatus::Closed->value)
+        ->assertJsonPath('data.deleted_batch_id', $batchId);
+
+    $draw->refresh();
+    expect($draw->status)->toBe(DrawStatus::Closed->value);
+    expect($draw->result_source)->toBeNull();
+    expect(DrawResultBatch::query()->where('draw_id', $draw->id)->count())->toBe(0);
+    expect(DrawResultItem::query()->where('draw_id', $draw->id)->count())->toBe(0);
+
+    Carbon::setTestNow();
+});
+
 test('admin can reopen cooldown draw for a replacement result batch', function (): void {
    Carbon::setTestNow(Carbon::parse('2026-05-09 14:30:00', 'UTC'));