feat(risk): 支持按开注商隔离风险池并新增经营报表

tests/Feature/AdminProviderProfitReportTest.php

@@ -0,0 +1,45 @@
+<?php
+
+use App\Models\Draw;
+use App\Models\Player;
+use App\Models\TicketItem;
+use App\Models\TicketOrder;
+use App\Services\Admin\AdminReportQueryService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+test('provider profit report aggregates split ticket items by provider', function (): void {
+    $player = Player::query()->create([
+        'site_code' => 'main', 'site_player_id' => 'provider-report-1', 'username' => 'provider_report',
+        'nickname' => null, 'default_currency' => 'NPR', 'status' => 0,
+    ]);
+    $draw = Draw::query()->create([
+        'draw_no' => 'RPT-PROVIDER-001', 'business_date' => '2026-07-10', 'sequence_no' => 1, 'status' => 'settled',
+        'start_time' => now()->subHour(), 'close_time' => now(), 'draw_time' => now()->addHour(),
+        'cooling_end_time' => null, 'result_source' => null, 'current_result_version' => 1, 'settle_version' => 1, 'is_reopened' => false,
+    ]);
+    $order = TicketOrder::query()->create([
+        'order_no' => 'RPT-PROVIDER-ORD', 'player_id' => $player->id, 'draw_id' => $draw->id, 'currency_code' => 'NPR',
+        'total_bet_amount' => 3000, 'total_rebate_amount' => 0, 'total_actual_deduct' => 3000,
+        'total_estimated_payout' => 0, 'status' => 'settled', 'submit_source' => 'h5', 'client_trace_id' => 'provider-report-trace',
+    ]);
+    foreach ([['SG', 'Singapore', 1000, 100], ['MY', 'Malaysia', 2000, 500]] as [$code, $name, $bet, $payout]) {
+        TicketItem::query()->create([
+            'ticket_no' => 'RPT-'.$code, 'order_id' => $order->id, 'player_id' => $player->id, 'draw_id' => $draw->id,
+            'provider_code' => $code, 'provider_name' => $name, 'original_number' => '1234', 'normalized_number' => '1234',
+            'play_code' => 'big', 'dimension' => 4, 'digit_slot' => null, 'bet_mode' => 'single', 'unit_bet_amount' => $bet,
+            'total_bet_amount' => $bet, 'rebate_rate_snapshot' => '0.0000', 'commission_rate_snapshot' => '0.0000',
+            'actual_deduct_amount' => $bet, 'win_amount' => $payout, 'jackpot_win_amount' => 0, 'status' => 'settled',
+        ]);
+    }
+
+    $rows = app(AdminReportQueryService::class)->providerProfitPaginated('2026-07-10', '2026-07-10', 1, 20)->items();
+
+    expect($rows)->toHaveCount(2)
+        ->and($rows[0]->provider_code)->toBe('MY')
+        ->and((int) $rows[0]->total_bet_minor)->toBe(2000)
+        ->and((int) $rows[0]->approx_house_gross_minor)->toBe(1500)
+        ->and($rows[1]->provider_code)->toBe('SG')
+        ->and((int) $rows[1]->total_payout_minor)->toBe(100);
+});

tests/Feature/AdminRiskPoolApiTest.php

@@ -165,16 +165,17 @@ test('admin can manually close and recover a risk pool number', function (): voi
 
     $this->assertDatabaseHas('risk_pool_lock_logs', [
         'draw_id' => $draw->id,
+        'provider_code' => 'SG',
         'normalized_number' => '2468',
         'action_type' => 'close',
         'amount' => 0,
         'source_reason' => 'admin_manual_close',
     ]);
 
-    expect(fn () => app(RiskPoolService::class)->preview($draw->id, [['number_4d' => '2468', 'amount' => 1]]))
+    expect(fn () => app(RiskPoolService::class)->preview($draw->id, 'SG', [['number_4d' => '2468', 'amount' => 1]]))
         ->toThrow(TicketOperationException::class, 'risk_sold_out');
 
-    expect(fn () => app(RiskPoolService::class)->acquire($draw->id, null, [['number_4d' => '2468', 'amount' => 1]]))
+    expect(fn () => app(RiskPoolService::class)->acquire($draw->id, 'SG', null, [['number_4d' => '2468', 'amount' => 1]]))
         ->toThrow(TicketOperationException::class, 'risk_sold_out');
 });
 
@@ -215,13 +216,14 @@ test('admin can recover a manually closed risk pool number', function (): void {
 
     $this->assertDatabaseHas('risk_pool_lock_logs', [
         'draw_id' => $draw->id,
+        'provider_code' => 'SG',
         'normalized_number' => '2468',
         'action_type' => 'recover',
         'amount' => 0,
         'source_reason' => 'admin_manual_recover',
     ]);
 
-    expect(app(RiskPoolService::class)->acquire($draw->id, null, [['number_4d' => '2468', 'amount' => 1]]))
+    expect(app(RiskPoolService::class)->acquire($draw->id, 'SG', null, [['number_4d' => '2468', 'amount' => 1]]))
         ->toBe(1);
 });
 
@@ -333,3 +335,69 @@ test('admin risk pool show 404 when pool missing', function (): void {
         ->getJson('/api/v1/admin/draws/'.$draw->id.'/risk-pools/0000')
         ->assertStatus(404);
 });
+
+test('admin risk pools keep same number separated by provider', function (): void {
+    $draw = Draw::query()->create([
+        'draw_no' => '20260512-008',
+        'business_date' => '2026-05-12',
+        'sequence_no' => 8,
+        'status' => 'open',
+        'start_time' => now()->subHour(),
+        'close_time' => now()->addHour(),
+        'draw_time' => now()->addHours(2),
+        'cooling_end_time' => null,
+        'result_source' => null,
+        'current_result_version' => 0,
+        'settle_version' => 0,
+        'is_reopened' => false,
+    ]);
+
+    RiskPool::query()->create([
+        'draw_id' => $draw->id,
+        'provider_code' => 'SG',
+        'normalized_number' => '1234',
+        'total_cap_amount' => 1_000,
+        'locked_amount' => 900,
+        'remaining_amount' => 100,
+        'sold_out_status' => 0,
+        'version' => 1,
+    ]);
+
+    RiskPool::query()->create([
+        'draw_id' => $draw->id,
+        'provider_code' => 'MY',
+        'normalized_number' => '1234',
+        'total_cap_amount' => 2_000,
+        'locked_amount' => 100,
+        'remaining_amount' => 1_900,
+        'sold_out_status' => 0,
+        'version' => 1,
+    ]);
+
+    RiskPoolLockLog::query()->create([
+        'draw_id' => $draw->id,
+        'provider_code' => 'MY',
+        'normalized_number' => '1234',
+        'ticket_item_id' => null,
+        'action_type' => 'lock',
+        'amount' => 100,
+        'source_reason' => 'ticket_place',
+        'created_at' => now(),
+    ]);
+
+    $token = mintRiskAdminToken();
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->getJson('/api/v1/admin/draws/'.$draw->id.'/risk-pools')
+        ->assertOk()
+        ->assertJsonPath('data.meta.total', 2)
+        ->assertJsonPath('data.items.0.provider_code', 'SG')
+        ->assertJsonPath('data.items.1.provider_code', 'MY');
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->getJson('/api/v1/admin/draws/'.$draw->id.'/risk-pools/1234?provider_code=MY')
+        ->assertOk()
+        ->assertJsonPath('data.pool.provider_code', 'MY')
+        ->assertJsonPath('data.pool.locked_amount', 100)
+        ->assertJsonPath('data.logs.items.0.provider_code', 'MY');
+});

tests/Feature/PlayerRealtimeBroadcastTest.php

@@ -88,7 +88,7 @@ test('risk pool acquire dispatches warning and sold out broadcasts', function ()
         'version' => 0,
     ]);
 
-    app(RiskPoolService::class)->acquire($draw->id, null, [
+    app(RiskPoolService::class)->acquire($draw->id, 'SG', null, [
         ['number_4d' => '1234', 'amount' => 250],
     ]);
 

tests/Feature/RiskPoolProviderIsolationTest.php

@@ -0,0 +1,123 @@
+<?php
+
+use App\Lottery\ConfigVersionStatus;
+use App\Models\Draw;
+use App\Models\RiskCapItem;
+use App\Models\RiskCapVersion;
+use App\Models\RiskPool;
+use App\Services\Ticket\PlayCatalogResolver;
+use App\Services\Ticket\RiskPoolService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+test('risk pool service isolates same number by provider', function (): void {
+    $draw = Draw::query()->create([
+        'draw_no' => '20260709-001',
+        'business_date' => '2026-07-09',
+        'sequence_no' => 1,
+        'status' => 'open',
+        'start_time' => now()->subHour(),
+        'close_time' => now()->addHour(),
+        'draw_time' => now()->addHours(2),
+        'cooling_end_time' => null,
+        'result_source' => null,
+        'current_result_version' => 0,
+        'settle_version' => 0,
+        'is_reopened' => false,
+    ]);
+
+    RiskPool::query()->create([
+        'draw_id' => $draw->id,
+        'provider_code' => 'SG',
+        'normalized_number' => '1234',
+        'total_cap_amount' => 1_000,
+        'locked_amount' => 1_000,
+        'remaining_amount' => 0,
+        'sold_out_status' => 1,
+        'version' => 1,
+    ]);
+
+    RiskPool::query()->create([
+        'draw_id' => $draw->id,
+        'provider_code' => 'MY',
+        'normalized_number' => '1234',
+        'total_cap_amount' => 1_000,
+        'locked_amount' => 100,
+        'remaining_amount' => 900,
+        'sold_out_status' => 0,
+        'version' => 1,
+    ]);
+
+    $service = app(RiskPoolService::class);
+
+    expect(fn () => $service->preview($draw->id, 'SG', [['number_4d' => '1234', 'amount' => 1]]))
+        ->toThrow(\App\Exceptions\TicketOperationException::class, 'risk_sold_out');
+
+    expect($service->preview($draw->id, 'MY', [['number_4d' => '1234', 'amount' => 200]]))
+        ->toBe([
+            ['number_4d' => '1234', 'amount' => 200, 'warning' => false],
+        ]);
+
+    expect($service->acquire($draw->id, 'MY', null, [['number_4d' => '1234', 'amount' => 200]]))
+        ->toBe(200);
+
+    $this->assertDatabaseHas('risk_pools', [
+        'draw_id' => $draw->id,
+        'provider_code' => 'SG',
+        'normalized_number' => '1234',
+        'locked_amount' => 1_000,
+        'remaining_amount' => 0,
+        'sold_out_status' => 1,
+    ]);
+
+    $this->assertDatabaseHas('risk_pools', [
+        'draw_id' => $draw->id,
+        'provider_code' => 'MY',
+        'normalized_number' => '1234',
+        'locked_amount' => 300,
+        'remaining_amount' => 700,
+        'sold_out_status' => 0,
+    ]);
+});
+
+test('risk cap resolver prefers provider-specific item and falls back to global', function (): void {
+    $version = RiskCapVersion::query()->create([
+        'version_no' => 1,
+        'status' => ConfigVersionStatus::Active->value,
+        'effective_at' => now(),
+    ]);
+
+    RiskCapItem::query()->create([
+        'version_id' => $version->id,
+        'provider_code' => 'GLOBAL',
+        'draw_id' => null,
+        'normalized_number' => '0000',
+        'cap_amount' => 12_345,
+        'cap_type' => 'default',
+    ]);
+
+    RiskCapItem::query()->create([
+        'version_id' => $version->id,
+        'provider_code' => 'GLOBAL',
+        'draw_id' => null,
+        'normalized_number' => '1234',
+        'cap_amount' => 777,
+        'cap_type' => 'per_number',
+    ]);
+
+    RiskCapItem::query()->create([
+        'version_id' => $version->id,
+        'provider_code' => 'MY',
+        'draw_id' => null,
+        'normalized_number' => '1234',
+        'cap_amount' => 555,
+        'cap_type' => 'per_number',
+    ]);
+
+    $resolver = app(PlayCatalogResolver::class);
+
+    expect($resolver->resolveCapAmount(9999, '1234', 'MY'))->toBe(555)
+        ->and($resolver->resolveCapAmount(9999, '1234', 'SG'))->toBe(777)
+        ->and($resolver->resolveCapAmount(9999, '5678', 'TH'))->toBe(12_345);
+});