mojiahui/webman-buildadmin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.ws优化bet.win订阅

Browse Source
This commit is contained in:
zhenhui
2026-05-26 18:54:30 +08:00
parent e163090bc2
commit 98b2696f89
2 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/common/service/GameBetSettleService.php
View File

@@ -171,8 +171,7 @@ final class GameBetSettleService
}
if (bccomp($win, '0', 2) > 0) {
$streakAtBet = (int) ($bet['streak_at_bet'] ?? 0);
$isJackpotTier = StreakWinReward::isJackpotForStreakAtBet($streakAtBet);
$jackpotFlags = self::betWinJackpotFlagsForOrder($bet, $win, $needReview);
if (!isset($winByUser[$userId])) {
$winByUser[$userId] = [
'user_id' => $userId,
@@ -182,12 +181,16 @@ final class GameBetSettleService
'total_win' => '0.00',
'balance_after' => $balanceAfter,
'is_jackpot' => false,
'payout_pending_review' => false,
'bets' => [],
];
}
if ($isJackpotTier) {
if ($jackpotFlags['is_jackpot']) {
$winByUser[$userId]['is_jackpot'] = true;
}
if ($jackpotFlags['payout_pending_review']) {
$winByUser[$userId]['payout_pending_review'] = true;
}
$winByUser[$userId]['total_win'] = bcadd($winByUser[$userId]['total_win'], $win, 2);
$winByUser[$userId]['balance_after'] = $balanceAfter;
$winByUser[$userId]['bets'][] = [
@@ -263,6 +266,7 @@ final class GameBetSettleService
'total_win' => (string) ($agg['total_win'] ?? '0.00'),
'balance_after' => (string) ($agg['balance_after'] ?? '0'),
'is_jackpot' => $isJackpotTier,
'payout_pending_review' => false,
'bets' => [],
];
Log::warning('bet.win fallback emitted for settled winner', [
@@ -328,9 +332,11 @@ final class GameBetSettleService
continue;
}
$isJackpot = !empty($payload['is_jackpot']);
$payoutPendingReview = !empty($payload['payout_pending_review']);
$data = GameWebSocketPayloadHelper::mergeUserStreakInto(array_merge($payload, [
'is_jackpot' => $isJackpot,
'is_win' => true,
'payout_pending_review' => $payoutPendingReview,
'server_time' => $now,
]), $userId);
GameWebSocketEventBus::publish(self::TOPIC_BET_WIN, $data);
@@ -368,6 +374,9 @@ final class GameBetSettleService
if ($userId === false || $userId <= 0) {
continue;
}
$orderStatus = filter_var($bet['status'] ?? 0, FILTER_VALIDATE_INT);
$needReview = $orderStatus === self::PLAY_STATUS_PENDING_REVIEW;
$jackpotFlags = self::betWinJackpotFlagsForOrder($bet, $win, $needReview);
if (!isset($winByUser[$userId])) {
$coin = Db::name('user')->where('id', $userId)->value('coin');
$winByUser[$userId] = [
@@ -378,12 +387,16 @@ final class GameBetSettleService
'total_win' => '0.00',
'balance_after' => (string) ($coin ?? '0'),
'is_jackpot' => false,
'payout_pending_review' => false,
'bets' => [],
];
}
if (StreakWinReward::isJackpotForStreakAtBet((int) ($bet['streak_at_bet'] ?? 0))) {
if ($jackpotFlags['is_jackpot']) {
$winByUser[$userId]['is_jackpot'] = true;
}
if ($jackpotFlags['payout_pending_review']) {
$winByUser[$userId]['payout_pending_review'] = true;
}
$winByUser[$userId]['total_win'] = bcadd((string) $winByUser[$userId]['total_win'], $win, 2);
$betId = filter_var($bet['id'] ?? 0, FILTER_VALIDATE_INT);
$winByUser[$userId]['bets'][] = [
@@ -396,7 +409,7 @@ final class GameBetSettleService
}
/**
* 大奖档命中时额外推送公共频道 jackpot.hit（与 bet.win 同一结算时刻，先后发出）。
* 大奖档命中时额外推送公共频道 jackpot.hit（全站公告；个人中奖通知仍以 bet.win 为准，不可替代）。
*
* @param list<array<string, mixed>> $jackpotHits
*/
@@ -622,6 +635,7 @@ final class GameBetSettleService
FILTER_VALIDATE_INT
);
if ($periodId !== false && $periodId > 0 && $resultNumber !== false && $resultNumber > 0 && bccomp($winAmount, '0', 2) > 0) {
$jackpotFlags = self::betWinJackpotFlagsForOrder($row, $winAmount, false);
self::publishBetWinsAfterCommit([[
'user_id' => $userId,
'period_id' => $periodId,
@@ -629,7 +643,8 @@ final class GameBetSettleService
'result_number' => $resultNumber,
'total_win' => $winAmount,
'balance_after' => is_string($balanceAfter ?? null) ? $balanceAfter : (string) (Db::name('user')->where('id', $userId)->value('coin') ?? '0'),
'is_jackpot' => StreakWinReward::isJackpotForStreakAtBet((int) ($row['streak_at_bet'] ?? 0)),
'is_jackpot' => $jackpotFlags['is_jackpot'],
'payout_pending_review' => false,
'bets' => [['bet_id' => $playRecordId, 'win_amount' => $winAmount]],
]], $periodId);
}
@@ -902,4 +917,21 @@ final class GameBetSettleService
}
return bccomp($winAmount, $threshold, 2) >= 0;
}
/**
* bet.win 展示用大奖标记：连胜大奖档 或 触发后台大奖审核阈值，均视为「中大奖」并走 bet.win 通知。
*
* @param array<string, mixed> $bet
* @return array{is_jackpot: bool, payout_pending_review: bool}
*/
private static function betWinJackpotFlagsForOrder(array $bet, string $winAmount, bool $needReview): array
{
$streakJackpot = StreakWinReward::isJackpotForStreakAtBet((int) ($bet['streak_at_bet'] ?? 0));
$amountJackpot = self::shouldRequireJackpotReview($winAmount, self::jackpotMaxAmount());
return [
'is_jackpot' => $streakJackpot || $amountJackpot || $needReview,
'payout_pending_review' => $needReview,
];
}
}