feat(draw): 支持多玩法provider及本地化结算时区功能

- Draw相关控制器添加provider_code和provider_name字段支持 - 允许手动录入开奖批次时指定provider_code - RNG开奖批次生成支持多provider，分别生成对应批次数据 - DrawPublishService和DrawManualResultService中支持基于provider_code管理开奖版本和发布流程 - DrawResultViewService调整，支持按provider汇总及筛选开奖结果 - Settlement处理逻辑调整，按provider区分待结算票据及批次，分开结算 - 结算期间管理相关服务支持使用站点本地结算时区计算开账建议和日期处理 - 增加AdminSite的settlement_timezone字段及相关请求验证和数据存取支持 - 优化AdminSettlementPeriod相关代码，防止存在未结清票据时关账 - Ticket明细返回接口添加结算时区信息，提升用户时间体验 - 多处查询排序和版本号处理改进，保证多provider数据正确顺序与一致性
2026-07-09 15:48:21 +08:00
parent c6c10f1397
commit d4779660c8
38 changed files with 1121 additions and 271 deletions
--- a/tests/Feature/DrawPipelineTest.php
+++ b/tests/Feature/DrawPipelineTest.php
@@ -3,6 +3,7 @@
 use Carbon\Carbon;
 use App\Models\Draw;
 use App\Models\Player;
+use App\Models\BetProvider;
 use App\Models\AdminRole;
 use App\Models\AdminUser;
 use App\Models\RiskPool;
@@ -466,6 +467,60 @@ test('admin can manually trigger rng for closed draw', function (): void {
    Carbon::setTestNow();
 });

+test('rng creates independent result batches for every enabled provider', function (): void {
+    config(['lottery.draw.require_manual_review' => true]);
+    Carbon::setTestNow(Carbon::parse('2026-05-09 12:22:00', 'UTC'));
+
+    foreach ([['SG', 'Singapore', 10], ['MY', 'Malaysia', 20], ['TH', 'Thailand', 30]] as [$code, $name, $sort]) {
+        BetProvider::query()->updateOrCreate(
+            ['code' => $code],
+            ['name' => $name, 'is_enabled' => true, 'sort_order' => $sort],
+        );
+    }
+
+    $draw = Draw::query()->create([
+        'draw_no' => '20260509-123',
+        'business_date' => '2026-05-09',
+        'sequence_no' => 123,
+        'status' => DrawStatus::Closed->value,
+        'start_time' => now()->copy()->subMinutes(20),
+        'close_time' => now()->copy()->subMinutes(5),
+        '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' => 'draw_rng_provider_admin',
+        'name' => 'Draw Rng Provider Admin',
+        'email' => null,
+        'password' => Hash::make('secret-strong'),
+        'status' => 0,
+    ]);
+    grantSuperAdminRole($admin);
+    $token = $admin->createToken('test', ['*'], now()->addDay())->plainTextToken;
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->postJson("/api/v1/admin/draws/{$draw->id}/rng")
+        ->assertOk()
+        ->assertJsonCount(3, 'data.batches');
+
+    $batches = DrawResultBatch::query()
+        ->where('draw_id', $draw->id)
+        ->with('items')
+        ->orderBy('provider_code')
+        ->get();
+
+    expect($batches->pluck('provider_code')->all())->toBe(['MY', 'SG', 'TH']);
+    expect($batches->pluck('rng_seed_hash')->unique()->count())->toBe(3);
+    expect($batches->map(fn (DrawResultBatch $batch): ?string => $batch->items->firstWhere('prize_type', 'first')?->number_4d)->unique()->count())->toBe(3);
+
+    Carbon::setTestNow();
+});
+
 test('draw tick moves open draw to closing when close_time passed before draw_time', function (): void {
    Carbon::setTestNow(Carbon::parse('2026-05-09 14:00:00', 'UTC'));

@@ -500,6 +555,8 @@ test('draw tick moves open draw to closing when close_time passed before draw_ti
 test('draw tick rng publishes result when manual review disabled', function (): void {
    config(['lottery.draw.require_manual_review' => false]);
    LotterySettings::put('draw.require_manual_review', false, 'draw', 'RNG 开奖后是否必须进入人工审核');
+    BetProvider::query()->updateOrCreate(['code' => 'SG'], ['name' => 'Singapore', 'is_enabled' => true, 'sort_order' => 10]);
+    BetProvider::query()->updateOrCreate(['code' => 'MY'], ['name' => 'Malaysia', 'is_enabled' => true, 'sort_order' => 20]);
    Carbon::setTestNow(Carbon::parse('2026-05-09 14:05:00', 'UTC'));

    $drawTime = now()->copy()->subMinute();
@@ -527,9 +584,11 @@ test('draw tick rng publishes result when manual review disabled', function ():
    expect($draw->current_result_version)->toBe(1);
    expect($draw->cooling_end_time)->not->toBeNull();

-    $batch = DrawResultBatch::query()->where('draw_id', $draw->id)->firstOrFail();
-    expect($batch->status)->toBe(DrawResultBatchStatus::Published->value);
-    expect($batch->items()->count())->toBe(23);
+    $batches = DrawResultBatch::query()->where('draw_id', $draw->id)->orderBy('provider_code')->get();
+    expect($batches)->toHaveCount(2);
+    expect($batches->pluck('provider_code')->all())->toBe(['MY', 'SG']);
+    expect($batches->every(fn (DrawResultBatch $batch): bool => $batch->status === DrawResultBatchStatus::Published->value))->toBeTrue();
+    expect($batches->every(fn (DrawResultBatch $batch): bool => $batch->items()->count() === 23))->toBeTrue();

    Carbon::setTestNow();
 });
@@ -537,6 +596,8 @@ test('draw tick rng publishes result when manual review disabled', function ():
 test('draw tick rng awaits manual publish when review enabled', function (): void {
    config(['lottery.draw.require_manual_review' => true]);
    LotterySettings::put('draw.require_manual_review', true, 'draw', 'RNG 开奖后是否必须进入人工审核');
+    BetProvider::query()->updateOrCreate(['code' => 'SG'], ['name' => 'Singapore', 'is_enabled' => true, 'sort_order' => 10]);
+    BetProvider::query()->updateOrCreate(['code' => 'MY'], ['name' => 'Malaysia', 'is_enabled' => true, 'sort_order' => 20]);
    Carbon::setTestNow(Carbon::parse('2026-05-09 14:06:00', 'UTC'));

    $drawTime = now()->copy()->subMinute();
@@ -562,8 +623,9 @@ test('draw tick rng awaits manual publish when review enabled', function (): voi
    $drawRow->refresh();
    expect($drawRow->status)->toBe(DrawStatus::Review->value);

-    $batch = DrawResultBatch::query()->where('draw_id', $drawRow->id)->firstOrFail();
-    expect($batch->status)->toBe(DrawResultBatchStatus::PendingReview->value);
+    $batches = DrawResultBatch::query()->where('draw_id', $drawRow->id)->orderBy('provider_code')->get();
+    expect($batches)->toHaveCount(2);
+    expect($batches->every(fn (DrawResultBatch $batch): bool => $batch->status === DrawResultBatchStatus::PendingReview->value))->toBeTrue();

    $admin = AdminUser::query()->create([
        'username' => 'draw_auditor',
@@ -575,14 +637,23 @@ test('draw tick rng awaits manual publish when review enabled', function (): voi
    grantSuperAdminRole($admin);
    $token = $admin->createToken('test', ['*'], now()->addDay())->plainTextToken;

+    $sgBatch = $batches->firstWhere('provider_code', 'SG');
+    $myBatch = $batches->firstWhere('provider_code', 'MY');
+    expect($sgBatch)->not->toBeNull()
+        ->and($myBatch)->not->toBeNull();
+
    $this->withHeader('Authorization', 'Bearer '.$token)
-        ->postJson("/api/v1/admin/draws/{$drawRow->id}/result-batches/{$batch->id}/publish")
+        ->postJson("/api/v1/admin/draws/{$drawRow->id}/result-batches/{$sgBatch->id}/publish")
+        ->assertOk();
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->postJson("/api/v1/admin/draws/{$drawRow->id}/result-batches/{$myBatch->id}/publish")
        ->assertOk();

    $drawRow->refresh();
-    $batch->refresh();
+    $batches = DrawResultBatch::query()->where('draw_id', $drawRow->id)->get();
    expect($drawRow->status)->toBe(DrawStatus::Cooldown->value);
-    expect($batch->status)->toBe(DrawResultBatchStatus::Published->value);
+    expect($batches->every(fn (DrawResultBatch $batch): bool => $batch->status === DrawResultBatchStatus::Published->value))->toBeTrue();
    expect($drawRow->current_result_version)->toBe(1);
    expect($drawRow->cooling_end_time)->not->toBeNull();

@@ -644,6 +715,73 @@ test('admin can create manual result batch with 23 numbers for review', function
    Carbon::setTestNow();
 });

+test('admin can create and publish provider specific manual result batches for one draw', function (): void {
+    Carbon::setTestNow(Carbon::parse('2026-05-09 14:22:00', 'UTC'));
+    BetProvider::query()->create(['code' => 'MY', 'name' => 'Malaysia', 'is_enabled' => true, 'sort_order' => 20]);
+
+    $draw = Draw::query()->create([
+        'draw_no' => '20260509-222',
+        'business_date' => '2026-05-09',
+        'sequence_no' => 222,
+        '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' => 'provider_manual_draw_admin',
+        'name' => 'Provider Manual Draw 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 + 101), 4, '0', STR_PAD_LEFT),
+        ];
+    }
+
+    $sgBatchId = $this->withHeader('Authorization', 'Bearer '.$token)
+        ->postJson("/api/v1/admin/draws/{$draw->id}/result-batches", ['provider_code' => 'SG', 'items' => $items])
+        ->assertOk()
+        ->assertJsonPath('data.batch.provider_code', 'SG')
+        ->json('data.batch.id');
+
+    $myBatchId = $this->withHeader('Authorization', 'Bearer '.$token)
+        ->postJson("/api/v1/admin/draws/{$draw->id}/result-batches", ['provider_code' => 'MY', 'items' => $items])
+        ->assertOk()
+        ->assertJsonPath('data.batch.provider_code', 'MY')
+        ->json('data.batch.id');
+
+    expect(DrawResultBatch::query()->where('draw_id', $draw->id)->where('status', DrawResultBatchStatus::PendingReview->value)->count())->toBe(2);
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->postJson("/api/v1/admin/draws/{$draw->id}/result-batches/{$sgBatchId}/publish")
+        ->assertOk()
+        ->assertJsonPath('data.provider_code', 'SG');
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->postJson("/api/v1/admin/draws/{$draw->id}/result-batches/{$myBatchId}/publish")
+        ->assertOk()
+        ->assertJsonPath('data.provider_code', 'MY');
+
+    expect(DrawResultBatch::query()->where('draw_id', $draw->id)->where('status', DrawResultBatchStatus::Published->value)->count())->toBe(2);
+
+    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'));

@@ -707,7 +845,11 @@ test('admin can discard pending manual result batch and draw returns to closed',
 });

 test('admin can reopen cooldown draw for a replacement result batch', function (): void {
+    config(['lottery.draw.require_manual_review' => false]);
+    LotterySettings::put('draw.require_manual_review', false, 'draw', 'RNG 开奖后是否必须进入人工审核');
    Carbon::setTestNow(Carbon::parse('2026-05-09 14:30:00', 'UTC'));
+    BetProvider::query()->updateOrCreate(['code' => 'SG'], ['name' => 'Singapore', 'is_enabled' => true, 'sort_order' => 10]);
+    BetProvider::query()->updateOrCreate(['code' => 'MY'], ['name' => 'Malaysia', 'is_enabled' => true, 'sort_order' => 20]);

    $draw = Draw::query()->create([
        'draw_no' => '20260509-230',
@@ -782,7 +924,7 @@ test('admin can reopen cooldown draw for a replacement result batch', function (

    $draw->refresh();
    expect($draw->current_result_version)->toBe(2);
-    expect(DrawResultBatch::query()->where('draw_id', $draw->id)->count())->toBe(2);
+    expect(DrawResultBatch::query()->where('draw_id', $draw->id)->count())->toBe(3);

    Carbon::setTestNow();
 });