diff --git a/app/Http/Controllers/HorseRaceController.php b/app/Http/Controllers/HorseRaceController.php index 55a0454..df9aacb 100644 --- a/app/Http/Controllers/HorseRaceController.php +++ b/app/Http/Controllers/HorseRaceController.php @@ -28,6 +28,12 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +/** + * 类功能：赛马竞猜前台控制器 + * + * 负责聊天室赛马玩法的当前场次查询、下注提交、历史记录读取， + * 并在发现线上遗留的超时 running 场次时执行最小范围的状态自愈。 + */ class HorseRaceController extends Controller { public function __construct( @@ -44,7 +50,7 @@ class HorseRaceController extends Controller return response()->json(['message' => '未登录', 'status' => 'error'], 401); } - $race = HorseRace::currentRace(); + $race = $this->resolveCurrentRaceState(HorseRace::currentRace()); if (! $race) { return response()->json([ @@ -264,6 +270,119 @@ class HorseRaceController extends Controller return response()->json(['history' => $history]); } + /** + * 自愈当前场次状态，避免线上遗漏结算时长期卡在 running。 + */ + private function resolveCurrentRaceState(?HorseRace $race): ?HorseRace + { + if (! $race || $race->status !== 'running') { + return $race; + } + + if (! $this->shouldRecoverStaleRunningRace($race)) { + return $race; + } + + $race = $this->prepareRunningRaceForSettlement($race); + if (! $race || $race->status !== 'running' || ! $race->winner_horse_id) { + return $race; + } + + // 线上若漏消费 CloseHorseRaceJob，这里同步补做一次结算，避免界面一直显示“跑马中”。 + app()->call([new \App\Jobs\CloseHorseRaceJob($race), 'handle']); + + return HorseRace::currentRace(); + } + + /** + * 判断 running 场次是否已经超过合理比赛时长，需要请求侧补偿收尾。 + */ + private function shouldRecoverStaleRunningRace(HorseRace $race): bool + { + if (! $race->race_starts_at) { + return false; + } + + $config = GameConfig::forGame('horse_racing')?->params ?? []; + $raceDuration = max(1, (int) ($config['race_duration'] ?? 30)); + $recoveryGraceSeconds = 5; + + return $race->race_starts_at->lte(now()->subSeconds($raceDuration + $recoveryGraceSeconds)); + } + + /** + * 为超时 running 场次补齐缺失赛果字段，确保后续结算任务可以安全执行。 + */ + private function prepareRunningRaceForSettlement(HorseRace $race): ?HorseRace + { + if ($race->winner_horse_id && $race->race_ends_at) { + return $race->fresh(); + } + + $horses = $this->normalizeRaceHorses($race->horses); + $winnerHorseId = $race->winner_horse_id ?: $this->resolveStaleRunningWinnerId($race, $horses); + if (! $winnerHorseId) { + return $race; + } + + $config = GameConfig::forGame('horse_racing')?->params ?? []; + $seedPool = (int) ($config['seed_pool'] ?? 0); + + // 线上补偿场景下以当前下注快照补齐统计，确保本次请求内的结算口径与正常流程一致。 + $totalBets = HorseBet::query()->where('race_id', $race->id)->count(); + $totalPool = $seedPool + (int) HorseBet::query()->where('race_id', $race->id)->sum('amount'); + + HorseRace::query() + ->where('id', $race->id) + ->where('status', 'running') + ->update([ + 'winner_horse_id' => $winnerHorseId, + 'race_ends_at' => $race->race_ends_at ?? now(), + 'total_bets' => $totalBets, + 'total_pool' => $totalPool, + ]); + + return $race->fresh(); + } + + /** + * 为异常滞留的 running 场次推导一个稳定冠军，避免多次请求得到不同结算结果。 + * + * @param array $horses + */ + private function resolveStaleRunningWinnerId(HorseRace $race, array $horses): ?int + { + if ($horses === []) { + return null; + } + + $horsePools = HorseBet::query() + ->where('race_id', $race->id) + ->groupBy('horse_id') + ->selectRaw('horse_id, SUM(amount) as pool') + ->pluck('pool', 'horse_id') + ->map(fn ($pool) => (int) $pool) + ->toArray(); + + $candidateIds = array_map( + fn (array $horse): int => (int) $horse['id'], + $horses, + ); + + usort($candidateIds, function (int $leftId, int $rightId) use ($horsePools): int { + $leftPool = (int) ($horsePools[$leftId] ?? 0); + $rightPool = (int) ($horsePools[$rightId] ?? 0); + + if ($leftPool === $rightPool) { + return $leftId <=> $rightId; + } + + return $rightPool <=> $leftPool; + }); + + return $candidateIds[0] ?? null; + } + /** * 兼容旧赛马数据结构，统一清洗为前端可消费的马匹数组。 * diff --git a/app/Jobs/RunHorseRaceJob.php b/app/Jobs/RunHorseRaceJob.php index eafb765..bbca827 100644 --- a/app/Jobs/RunHorseRaceJob.php +++ b/app/Jobs/RunHorseRaceJob.php @@ -22,6 +22,12 @@ use App\Services\ChatStateService; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Queue\Queueable; +/** + * 类功能：赛马跑马动画广播与结算衔接任务 + * + * 负责在押注截止后推进 running 流程、广播实时进度， + * 并在同一条任务链中补齐赛果与触发最终结算，避免线上状态滞留。 + */ class RunHorseRaceJob implements ShouldQueue { use Queueable; @@ -156,8 +162,8 @@ class RunHorseRaceJob implements ShouldQueue 'total_pool' => $totalPool, ]); - // 触发结算任务 - CloseHorseRaceJob::dispatch($race->fresh()); + // 在同一条队列任务里直接完成结算，避免线上出现“已跑完但 Close 任务未继续消费”的断链。 + app()->call([new CloseHorseRaceJob($race->fresh()), 'handle']); } /** diff --git a/app/Models/HorseRace.php b/app/Models/HorseRace.php index d22aba4..954d6d1 100644 --- a/app/Models/HorseRace.php +++ b/app/Models/HorseRace.php @@ -16,6 +16,12 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; +/** + * 类功能：赛马竞猜局次模型 + * + * 负责描述赛马场次的生命周期、参赛马匹、下注汇总与派奖计算， + * 并为控制器和队列任务提供当前场次、赔率与奖池算法支持。 + */ class HorseRace extends Model { protected $fillable = [ diff --git a/tests/Feature/HorseRaceControllerTest.php b/tests/Feature/HorseRaceControllerTest.php index 609904f..7071f46 100644 --- a/tests/Feature/HorseRaceControllerTest.php +++ b/tests/Feature/HorseRaceControllerTest.php @@ -11,6 +11,7 @@ namespace Tests\Feature; use App\Events\HorseRaceSettled; use App\Jobs\CloseHorseRaceJob; +use App\Jobs\RunHorseRaceJob; use App\Jobs\SaveMessageJob; use App\Models\GameConfig; use App\Models\HorseBet; @@ -170,6 +171,46 @@ class HorseRaceControllerTest extends TestCase $this->assertSame(10000, $response->json('race.total_pool')); } + /** + * 方法功能：验证超时未结算的 running 场次会在读取当前场次时自动收尾。 + */ + public function test_current_race_auto_recovers_stale_running_race(): void + { + Queue::fake(); + + /** @var \App\Models\User $user */ + $user = User::factory()->create(['jjb' => 500]); + + $race = HorseRace::create([ + 'status' => 'running', + 'bet_opens_at' => now()->subMinutes(3), + 'bet_closes_at' => now()->subMinutes(2), + 'race_starts_at' => now()->subMinutes(2), + 'horses' => [ + ['id' => 1, 'name' => 'Horse A', 'emoji' => '🐎'], + ['id' => 2, 'name' => 'Horse B', 'emoji' => '🏇'], + ], + 'total_pool' => 0, + ]); + + HorseBet::create([ + 'race_id' => $race->id, + 'user_id' => $user->id, + 'horse_id' => 2, + 'amount' => 100, + 'status' => 'pending', + ]); + + $user->decrement('jjb', 100); + + $response = $this->actingAs($user)->getJson(route('horse-race.current')); + + $response->assertOk(); + $response->assertJson(['race' => null]); + $this->assertSame('settled', $race->fresh()->status); + $this->assertSame(2, $race->fresh()->winner_horse_id); + } + /** * 方法功能：验证用户可以成功下注。 */ @@ -519,4 +560,50 @@ class HorseRaceControllerTest extends TestCase // 公屏赛果消息 + 参与者私聊结算通知，都应进入落库队列。 Queue::assertPushed(SaveMessageJob::class, 2); } + + /** + * 方法功能：验证跑马任务会在同一条任务链内直接完成结算。 + */ + public function test_run_horse_race_job_settles_race_without_follow_up_queue_hop(): void + { + Queue::fake(); + + $race = HorseRace::create([ + 'status' => 'betting', + 'bet_opens_at' => now()->subMinutes(2), + 'bet_closes_at' => now()->subMinute(), + 'horses' => [ + ['id' => 1, 'name' => 'Horse A', 'emoji' => '🐎'], + ['id' => 2, 'name' => 'Horse B', 'emoji' => '🏇'], + ], + 'total_pool' => 10000, + ]); + + GameConfig::updateOrCreate( + ['game_key' => 'horse_racing'], + [ + 'name' => 'Horse Racing', + 'icon' => 'horse', + 'description' => 'Horse Racing Game', + 'enabled' => true, + 'params' => [ + 'min_bet' => 100, + 'max_bet' => 100000, + 'house_take_percent' => 5, + 'seed_pool' => 10000, + 'race_duration' => 1, + ], + ] + ); + + (new RunHorseRaceJob($race))->handle(app(ChatStateService::class)); + + $race->refresh(); + + $this->assertSame('settled', $race->status); + $this->assertNotNull($race->winner_horse_id); + $this->assertNotNull($race->settled_at); + Queue::assertPushed(SaveMessageJob::class, 2); + Queue::assertNotPushed(CloseHorseRaceJob::class); + } }