feat: 切换 schema dump 基线并增强返点结算与管理校验

tests/Feature/AdminAuditLogDedupTest.php

@@ -28,7 +28,9 @@ test('audit log presenter maps business action and entity target', function ():
 
     $payload = AuditLogApiPresenter::row($row);
 
-    expect($payload['module_label'])->toBe('代理')
+    expect($payload['operator_label'])->toBe('管理员 #1')
+        ->and($payload['operator_subtitle'])->toBeNull()
+        ->and($payload['module_label'])->toBe('代理')
         ->and($payload['action_label'])->toBe('同步代理角色权限')
         ->and($payload['target_label'])->toBe('角色 #5');
 });
@@ -106,18 +108,9 @@ test('agent role permission sync records one business audit and skips middleware
 });
 
 test('audit log index returns chinese display labels', function (): void {
-    AuditLogger::record(
-        AuditLogger::OPERATOR_ADMIN,
-        1,
-        'agent',
-        'agent_role.sync_permissions',
-        'admin_role',
-        '9',
-    );
-
     $admin = AdminUser::query()->create([
         'username' => 'audit_list_super',
-        'name' => 'Super',
+        'name' => '超管甲',
         'email' => null,
         'password' => Hash::make('secret-strong'),
         'status' => 0,
@@ -125,10 +118,21 @@ test('audit log index returns chinese display labels', function (): void {
     grantSuperAdminRole($admin);
     $token = $admin->createToken('test', ['*'], now()->addDay())->plainTextToken;
 
+    AuditLogger::record(
+        AuditLogger::OPERATOR_ADMIN,
+        (int) $admin->id,
+        'agent',
+        'agent_role.sync_permissions',
+        'admin_role',
+        '9',
+    );
+
     $this->withHeader('Authorization', 'Bearer '.$token)
         ->getJson('/api/v1/admin/audit-logs?per_page=5')
         ->assertOk()
         ->assertJsonPath('code', ErrorCode::Success->value)
+        ->assertJsonPath('data.items.0.operator_label', '超管甲')
+        ->assertJsonPath('data.items.0.operator_subtitle', '管理员 #'.$admin->id)
         ->assertJsonPath('data.items.0.module_label', '代理')
         ->assertJsonPath('data.items.0.action_label', '同步代理角色权限')
         ->assertJsonPath('data.items.0.target_label', '角色 #9');

tests/Feature/AdminCurrencyApiTest.php

@@ -165,3 +165,28 @@ test('enabling currency as bettable bootstraps odds items and jackpot pool', fun
         'currency_code' => 'USD',
     ]);
 });
+
+test('cannot delete currency referenced by admin site default currency', function (): void {
+    $token = mintCurrencyAdminToken();
+
+    Currency::query()->create([
+        'code' => 'EUR',
+        'name' => 'Euro',
+        'decimal_places' => 2,
+        'is_enabled' => true,
+        'is_bettable' => false,
+    ]);
+
+    DB::table('admin_sites')
+        ->where('is_default', true)
+        ->update(['currency_code' => 'EUR']);
+
+    $this->withHeader('Authorization', 'Bearer '.$token)
+        ->deleteJson('/api/v1/admin/currencies/EUR')
+        ->assertStatus(422)
+        ->assertJsonPath('data.references.0', '站点默认币种');
+
+    $this->assertDatabaseHas('currencies', [
+        'code' => 'EUR',
+    ]);
+});

tests/Feature/AdminSettlementJackpotApiTest.php

@@ -390,7 +390,7 @@ test('manual burst broadcast includes published first prize number', function ()
 
     $this->withHeader('Authorization', 'Bearer '.$token)
         ->postJson('/api/v1/admin/jackpot/pools/'.$pool->id.'/manual-burst', [
-            'draw_id' => $draw->id,
+            'draw_id' => (string) $draw->draw_no,
         ])
         ->assertOk();
 

tests/Feature/AgentPeriodCloseFromGameSettlementTest.php

@@ -170,3 +170,171 @@ test('period close aggregates share ledger written by game settlement recorder',
         ->and((int) $playerBill->gross_win_loss)->toBe($betMinor)
         ->and((int) $playerBill->rebate_amount)->toBeGreaterThan(0);
 });
+
+test('credit settlement records base rebate plus add-on rebate and keeps extra rebate separate', function (): void {
+    $siteId = (int) DB::table('admin_sites')->where('is_default', true)->value('id');
+    $siteCode = (string) DB::table('admin_sites')->where('id', $siteId)->value('code');
+    $rootId = (int) DB::table('agent_nodes')->where('admin_site_id', $siteId)->where('depth', 0)->value('id');
+
+    $super = \App\Models\AdminUser::query()->create([
+        'username' => 'pipe_extra_super',
+        'name' => 'Super',
+        'email' => null,
+        'password' => \Illuminate\Support\Facades\Hash::make('secret-strong'),
+        'status' => 0,
+    ]);
+    grantSuperAdminRole($super);
+
+    $leaf = app(AgentNodeService::class)->createChild($super, agentChildPayload([
+        'parent_id' => $rootId,
+        'code' => 'PIPE-X',
+        'name' => 'Pipe X',
+        'username' => 'pipe_x',
+        'total_share_rate' => 25,
+        'credit_limit' => 100_000,
+        'default_player_rebate' => 0.005,
+        'can_grant_extra_rebate' => true,
+    ]));
+
+    AgentProfile::query()->where('agent_node_id', $rootId)->update([
+        'total_share_rate' => 100,
+        'default_player_rebate' => 0.005,
+    ]);
+
+    $player = Player::query()->create([
+        'site_code' => $siteCode,
+        'agent_node_id' => $leaf->id,
+        'site_player_id' => 'pipe-x1',
+        'username' => 'pipeextra',
+        'nickname' => null,
+        'auth_source' => 'lottery_native',
+        'funding_mode' => 'credit',
+        'default_currency' => 'NPR',
+        'status' => 0,
+    ]);
+
+    DB::table('player_credit_accounts')->insert([
+        'player_id' => $player->id,
+        'credit_limit' => 50_000,
+        'used_credit' => 0,
+        'frozen_credit' => 0,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    DB::table('player_rebate_profiles')->insert([
+        'player_id' => $player->id,
+        'game_type' => 'big',
+        'rebate_rate' => 0.005,
+        'extra_rebate_rate' => 0.002,
+        'inherit_from_agent' => false,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $betMinor = 10_000;
+    $draw = Draw::query()->create([
+        'draw_no' => 'PIPE-DRAW-X',
+        'business_date' => now()->toDateString(),
+        'sequence_no' => 108,
+        'status' => DrawStatus::Open->value,
+        'current_result_version' => 0,
+        'settle_version' => 0,
+        'is_reopened' => false,
+    ]);
+
+    $order = TicketOrder::query()->create([
+        'order_no' => 'ORD-PIPE-X',
+        'player_id' => $player->id,
+        'draw_id' => $draw->id,
+        'currency_code' => 'NPR',
+        'total_bet_amount' => $betMinor,
+        'total_rebate_amount' => 0,
+        'total_actual_deduct' => $betMinor,
+        'total_estimated_payout' => 0,
+        'status' => 'confirmed',
+        'submit_source' => 'h5',
+        'client_trace_id' => 'pipe-trace-x',
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $item = TicketItem::query()->create([
+        'ticket_no' => 'T-PIPE-X',
+        'order_id' => $order->id,
+        'player_id' => $player->id,
+        'draw_id' => $draw->id,
+        'original_number' => '1234',
+        'normalized_number' => '1234',
+        'play_code' => 'big',
+        'dimension' => 2,
+        'digit_slot' => null,
+        'bet_mode' => 'single',
+        'unit_bet_amount' => $betMinor,
+        'total_bet_amount' => $betMinor,
+        'rebate_rate_snapshot' => '0.0000',
+        'commission_rate_snapshot' => '0.0000',
+        'actual_deduct_amount' => $betMinor,
+        'odds_snapshot_json' => [
+            ['prize_scope' => 'first', 'rebate_rate' => '0.0100', 'commission_rate' => '0.0000', 'odds_value' => 250000],
+        ],
+        'rule_snapshot_json' => [
+            'base_rebate_rate' => '0.0100',
+            'player_addon_rebate_rate' => '0.0070',
+            'rebate_inherited_from_agent' => false,
+        ],
+        'combination_count' => 1,
+        'estimated_max_payout' => 0,
+        'risk_locked_amount' => 0,
+        'status' => 'settled_lose',
+        'win_amount' => 0,
+        'jackpot_win_amount' => 0,
+    ]);
+    $item->setRelation('player', $player);
+
+    app(AgentGameSettlementRecorder::class)->recordForTicketItem($item, 0, 'settled_lose');
+
+    $item->refresh();
+    expect((float) $item->agent_rebate_rate_snapshot)->toBe(0.015);
+
+    $basic = DB::table('rebate_records')
+        ->where('ticket_item_id', $item->id)
+        ->where('rebate_type', 'basic')
+        ->first();
+    $extra = DB::table('rebate_records')
+        ->where('ticket_item_id', $item->id)
+        ->where('rebate_type', 'extra')
+        ->first();
+
+    expect($basic)->not->toBeNull()
+        ->and((float) $basic->rebate_rate)->toBe(0.015)
+        ->and((int) $basic->rebate_amount)->toBe(150);
+    expect($extra)->not->toBeNull()
+        ->and((float) $extra->rebate_rate)->toBe(0.002)
+        ->and((int) $extra->rebate_amount)->toBe(20);
+
+    $ledger = DB::table('share_ledger')->where('ticket_item_id', $item->id)->first();
+    expect($ledger)->not->toBeNull()
+        ->and((int) $ledger->basic_rebate)->toBe(150);
+
+    $settledAt = (string) $ledger->settled_at;
+    $periodId = (int) DB::table('settlement_periods')->insertGetId([
+        'admin_site_id' => $siteId,
+        'period_start' => now()->parse($settledAt)->subDay(),
+        'period_end' => now()->parse($settledAt)->addDay(),
+        'status' => 'open',
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    app(AgentSettlementPeriodCloseService::class)->closePeriod($periodId);
+
+    $playerBill = DB::table('settlement_bills')
+        ->where('settlement_period_id', $periodId)
+        ->where('bill_type', 'player')
+        ->where('owner_id', $player->id)
+        ->first();
+
+    expect($playerBill)->not->toBeNull()
+        ->and((int) $playerBill->rebate_amount)->toBe(170);
+});

tests/Feature/JackpotPlacementSettlementTest.php

@@ -6,6 +6,7 @@ use App\Models\AdminUser;
 use App\Models\TicketItem;
 use App\Lottery\DrawStatus;
 use App\Models\JackpotPool;
+use App\Models\OddsVersion;
 use App\Models\TicketOrder;
 use App\Models\PlayerWallet;
 use App\Models\DrawResultItem;
@@ -17,6 +18,7 @@ use App\Events\JackpotBurstBroadcast;
 use App\Services\Draw\DrawResultViewService;
 use App\Models\JackpotContribution;
 use Illuminate\Support\Facades\Hash;
+use App\Lottery\ConfigVersionStatus;
 use Database\Seeders\CurrencySeeder;
 use Database\Seeders\PlayTypeSeeder;
 use App\Lottery\DrawResultBatchStatus;
@@ -292,6 +294,62 @@ test('jackpot contribution respects switch and minimum bet threshold', function
     expect(JackpotContribution::query()->count())->toBe(0);
 });
 
+test('jackpot contribution uses total bet amount instead of actual deduct amount', function (): void {
+    jackpotUpsertPool([
+        'currency_code' => 'NPR',
+        'current_amount' => 0,
+        'contribution_rate' => '0.1000',
+        'trigger_threshold' => 1,
+        'payout_rate' => '1.0000',
+        'force_trigger_draw_gap' => 0,
+        'min_bet_amount' => 10_000,
+        'status' => 1,
+        'last_trigger_draw_id' => null,
+    ]);
+
+    $player = jackpotTestPlayer('jprebate');
+    $draw = jackpotOpenDraw('20260511-902A');
+
+    $oddsVersionId = OddsVersion::query()
+        ->where('status', ConfigVersionStatus::Active->value)
+        ->value('id');
+    expect($oddsVersionId)->not->toBeNull();
+
+    DB::table('odds_items')
+        ->where('version_id', $oddsVersionId)
+        ->where('play_code', 'straight')
+        ->update(['rebate_rate' => 0.01]);
+
+    DB::table('player_rebate_profiles')->insert([
+        'player_id' => $player->id,
+        'game_type' => 'straight',
+        'rebate_rate' => 0.005,
+        'extra_rebate_rate' => 0.002,
+        'inherit_from_agent' => false,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->withHeader('Authorization', 'Bearer dev:'.$player->id)
+        ->postJson('/api/v1/ticket/place', [
+            'draw_id' => '20260511-902A',
+            'currency_code' => 'NPR',
+            'client_trace_id' => 'jp-rebate-base',
+            'lines' => [['number' => '1234', 'play_code' => 'straight', 'amount' => 10_000]],
+        ])
+        ->assertOk()
+        ->assertJsonPath('data.summary.total_actual_deduct', 9_830);
+
+    $contribution = JackpotContribution::query()->firstOrFail();
+    $item = TicketItem::query()->firstOrFail();
+    $pool = JackpotPool::query()->where('currency_code', 'NPR')->firstOrFail();
+
+    expect((int) $item->total_bet_amount)->toBe(10_000)
+        ->and((int) $item->actual_deduct_amount)->toBe(9_830)
+        ->and((int) $contribution->contribution_amount)->toBe(1_000)
+        ->and((int) $pool->current_amount)->toBe(1_000);
+});
+
 test('jackpot bursts by configured play combination trigger before threshold', function (): void {
     Event::fake([JackpotBurstBroadcast::class]);
     config([

tests/Feature/PublicSettingsApiTest.php

@@ -18,22 +18,10 @@ test('public settings requires allowed group', function (): void {
     $this->getJson('/api/v1/settings?group=wallet')
         ->assertStatus(400)
         ->assertJsonPath('code', ErrorCode::ClientHttpError->value);
-});
-
-test('public settings returns currency group', function (): void {
-    \App\Models\LotterySetting::query()->updateOrCreate(
-        ['setting_key' => 'currency.display_decimals'],
-        [
-            'group_name' => 'currency',
-            'value_json' => 3,
-            'description_zh' => '展示小数位',
-        ],
-    );
-
+        
     $this->getJson('/api/v1/settings?group=currency')
-        ->assertOk()
-        ->assertJsonPath('code', ErrorCode::Success->value)
-        ->assertJsonFragment(['key' => 'currency.display_decimals', 'value' => 3]);
+        ->assertStatus(400)
+        ->assertJsonPath('code', ErrorCode::ClientHttpError->value);
 });
 
 test('public settings returns frontend group only', function (): void {

tests/Feature/TicketBettingApiTest.php

@@ -910,6 +910,70 @@ test('ticket place sold out for second player after first consumes shared pool',
     expect((int) $pool->remaining_amount)->toBe(2000);
 });
 
+test('ticket preview and place apply base rebate plus player add-on rebate for wallet player', function (): void {
+    $player = ticketPlayerWithWallet(500_000);
+    ticketOpenDraw();
+
+    $oddsVersionId = OddsVersion::query()
+        ->where('status', ConfigVersionStatus::Active->value)
+        ->value('id');
+    expect($oddsVersionId)->not->toBeNull();
+
+    DB::table('odds_items')
+        ->where('version_id', $oddsVersionId)
+        ->where('play_code', 'big')
+        ->update(['rebate_rate' => 0.01]);
+
+    DB::table('player_rebate_profiles')->insert([
+        'player_id' => $player->id,
+        'game_type' => 'big',
+        'rebate_rate' => 0.005,
+        'extra_rebate_rate' => 0.002,
+        'inherit_from_agent' => false,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $payload = [
+        'draw_id' => '20260511-001',
+        'currency_code' => 'NPR',
+        'client_trace_id' => 'trace-wallet-rebate-stack',
+        'lines' => [
+            ['number' => '1234', 'play_code' => 'big', 'amount' => 10_000],
+        ],
+    ];
+
+    $this->withHeader('Authorization', 'Bearer dev:'.$player->id)
+        ->postJson('/api/v1/ticket/preview', $payload)
+        ->assertOk()
+        ->assertJsonPath('data.summary.total_bet_amount', 10_000)
+        ->assertJsonPath('data.summary.total_actual_deduct', 9_830)
+        ->assertJsonPath('data.summary.total_rebate_amount', 170)
+        ->assertJsonPath('data.lines.0.rebate_rate', '0.0170')
+        ->assertJsonPath('data.lines.0.rebate_amount', 170)
+        ->assertJsonPath('data.lines.0.actual_deduct_amount', 9_830)
+        ->assertJsonPath('data.lines.0.rule_snapshot_json.base_rebate_rate', '0.0100')
+        ->assertJsonPath('data.lines.0.rule_snapshot_json.player_addon_rebate_rate', '0.0070')
+        ->assertJsonPath('data.lines.0.rule_snapshot_json.rebate_inherited_from_agent', false);
+
+    $this->withHeader('Authorization', 'Bearer dev:'.$player->id)
+        ->postJson('/api/v1/ticket/place', $payload)
+        ->assertOk()
+        ->assertJsonPath('data.summary.total_bet_amount', 10_000)
+        ->assertJsonPath('data.summary.total_actual_deduct', 9_830);
+
+    $item = TicketItem::query()->where('play_code', 'big')->firstOrFail();
+    $ruleSnapshot = is_array($item->rule_snapshot_json) ? $item->rule_snapshot_json : [];
+
+    expect((string) $item->rebate_rate_snapshot)->toBe('0.0170')
+        ->and((int) $item->actual_deduct_amount)->toBe(9_830)
+        ->and($ruleSnapshot['base_rebate_rate'] ?? null)->toBe('0.0100')
+        ->and($ruleSnapshot['player_addon_rebate_rate'] ?? null)->toBe('0.0070');
+
+    $wallet = PlayerWallet::query()->where('player_id', $player->id)->firstOrFail();
+    expect((int) $wallet->balance)->toBe(500_000 - 9_830);
+});
+
 test('ticket pending confirmation reconcile releases risk when wallet deduction is missing', function (): void {
     $draw = ticketOpenDraw();
     $player = ticketPlayerWithWallet();