xiaokang/lotteryLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 增强奖池与钱包管理功能

Browse Source 
更新 AdminJackpotPoolUpdateController 校验规则，禁止传入 current_amount。
优化 AdminRiskPoolManualStatusController：更新奖池状态后同步 Redis 状态。
在 TransferOrderReconcileController 中新增 completeCredit 方法，用于处理卡住的转账订单对账。
调整 TransferOrderListController：优化转账订单处理条件。
在 TicketItemsIndexController 中实现支持时区的日期筛选，提升日期处理准确性。
扩展 JackpotPool 模型，新增 adjustments 关联关系。
改进票据与钱包相关服务中的错误处理和事务管理。
This commit is contained in:
kang
2026-05-26 14:58:41 +08:00
parent 48349e3302
commit c8c90e3e94
45 changed files with 1877 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Services/Ticket/TicketPlacementService.php
View File

@@ -7,13 +7,13 @@ use App\Models\Player;
use App\Lottery\ErrorCode;
use App\Models\TicketItem;
use App\Models\WalletTxn;
use App\Lottery\DrawStatus;
use App\Models\TicketOrder;
use App\Models\PlayerWallet;
use App\Models\TicketCombination;
use Illuminate\Support\Facades\DB;
use App\Exceptions\TicketOperationException;
use App\Services\Jackpot\JackpotContributionService;
use App\Services\Draw\DrawHallSnapshotBuilder;
final class TicketPlacementService
{
@@ -23,6 +23,7 @@ final class TicketPlacementService
private readonly RiskPoolService $riskPoolService,
private readonly TicketWalletService $ticketWalletService,
private readonly JackpotContributionService $jackpotContribution,
private readonly DrawHallSnapshotBuilder $drawHallSnapshot,
) {}
/**
@@ -36,11 +37,14 @@ final class TicketPlacementService
? (string) $payload['client_trace_id']
: null;
if ($clientTraceId !== null) {
$drawNo = (string) $payload['draw_id'];
$drawIdForIdempotency = Draw::query()->where('draw_no', $drawNo)->value('id');
if ($clientTraceId !== null && $drawIdForIdempotency !== null) {
$existing = TicketOrder::query()
->where('player_id', $player->id)
->where('draw_id', $drawIdForIdempotency)
->where('client_trace_id', $clientTraceId)
->whereIn('status', ['placed', 'partial_failed'])
->first();
if ($existing !== null) {
@@ -72,7 +76,7 @@ final class TicketPlacementService
if ($draw === null) {
throw new TicketOperationException('draw_not_found', ErrorCode::BetInvalidDraw->value);
}
if ($draw->status !== DrawStatus::Open->value || ($draw->close_time !== null && now()->greaterThanOrEqualTo($draw->close_time))) {
if (! $this->drawHallSnapshot->isBettingOpen($draw)) {
throw new TicketOperationException('draw_closed', ErrorCode::DrawClosed->value);
}
@@ -132,13 +136,15 @@ final class TicketPlacementService
);
}
$walletBalance = (int) (PlayerWallet::query()
$wallet = PlayerWallet::query()
->where('player_id', $player->id)
->where('wallet_type', 'lottery')
->where('currency_code', $currencyCode)
->lockForUpdate()
->value('balance') ?? 0);
if ($walletBalance < $totalActualDeduct) {
->first();
$walletBalance = $wallet !== null ? (int) $wallet->balance : 0;
$walletAvailable = $walletBalance - ($wallet !== null ? (int) $wallet->frozen_balance : 0);
if ($walletAvailable < $totalActualDeduct) {
throw new TicketOperationException('bet_insufficient_balance', ErrorCode::BetInsufficientBalance->value);
}
@@ -333,6 +339,10 @@ final class TicketPlacementService
$order = TicketOrder::query()->whereKey($order->id)->firstOrFail();
$draw = Draw::query()->whereKey((int) $order->draw_id)->firstOrFail();
$successCount = TicketItem::query()->where('order_id', $order->id)->where('status', 'pending_draw')->count();
$pendingConfirmCount = TicketItem::query()
->where('order_id', $order->id)
->whereIn('status', ['pending_confirm', 'partial_pending_confirm'])
->count();
$failureCount = TicketItem::query()->where('order_id', $order->id)->where('status', 'failed')->count();
if ($balanceAfter === null) {
$walletTxn = WalletTxn::query()
@@ -350,11 +360,13 @@ final class TicketPlacementService
'status' => $draw->status,
],
'summary' => [
'order_status' => $order->status,
'total_bet_amount' => (int) $order->total_bet_amount,
'total_rebate_amount' => (int) $order->total_rebate_amount,
'total_actual_deduct' => (int) $order->total_actual_deduct,
'total_estimated_payout' => (int) $order->total_estimated_payout,
'success_count' => $successCount,
'pending_confirm_count' => $pendingConfirmCount,
'failure_count' => $failureCount,
],
'balance_after' => $balanceAfter,