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

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

View File

@@ -2,15 +2,21 @@
namespace App\Services\Ticket;
use App\Models\Draw;
use App\Models\WalletTxn;
use App\Models\TicketItem;
use App\Models\TicketOrder;
use App\Services\Draw\DrawHallSnapshotBuilder;
use App\Services\Jackpot\JackpotContributionService;
use Illuminate\Support\Facades\DB;
final class TicketPendingConfirmReconcileService
{
public function __construct(
private readonly RiskPoolService $riskPool,
private readonly JackpotContributionService $jackpotContribution,
private readonly DrawHallSnapshotBuilder $drawHallSnapshot,
private readonly TicketWalletService $ticketWallet,
) {}
/**
@@ -20,7 +26,7 @@ final class TicketPendingConfirmReconcileService
{
$cutoff = now()->subMinutes($staleMinutes);
$orders = TicketOrder::query()
->where('status', 'pending_confirm')
->whereIn('status', ['pending_confirm', 'partial_pending_confirm'])
->where('updated_at', '<=', $cutoff)
->orderBy('id')
->limit($limit)
@@ -35,7 +41,7 @@ final class TicketPendingConfirmReconcileService
->lockForUpdate()
->first();
if ($lockedOrder === null || $lockedOrder->status !== 'pending_confirm') {
if ($lockedOrder === null || ! in_array($lockedOrder->status, ['pending_confirm', 'partial_pending_confirm'], true)) {
return 'skipped';
}
@@ -46,52 +52,10 @@ final class TicketPendingConfirmReconcileService
->exists();
if ($hasPostedDeduct) {
TicketItem::query()
->where('order_id', $lockedOrder->id)
->where('status', 'pending_confirm')
->update([
'status' => 'pending_draw',
'fail_reason_code' => null,
'fail_reason_text' => null,
'updated_at' => now(),
]);
$lockedOrder->forceFill(['status' => 'placed'])->save();
return 'confirmed';
return $this->confirmOrder($lockedOrder);
}
$items = TicketItem::query()
->where('order_id', $lockedOrder->id)
->where('status', 'pending_confirm')
->with('combinations')
->lockForUpdate()
->get();
foreach ($items as $item) {
$locks = [];
foreach ($item->combinations as $combo) {
$locks[] = [
'number_4d' => (string) $combo->number_4d,
'amount' => (int) $combo->estimated_payout,
];
}
if ($locks !== []) {
$this->riskPool->release((int) $lockedOrder->draw_id, $item, $locks);
}
$item->forceFill([
'status' => 'refunded',
'fail_reason_code' => 'pending_confirm_timeout',
'fail_reason_text' => 'pending_confirm_timeout_refund',
'risk_locked_amount' => 0,
])->save();
}
$lockedOrder->forceFill(['status' => 'refunded'])->save();
return 'refunded';
return $this->refundOrderWithoutDeduct($lockedOrder);
});
if ($result === 'skipped') {
@@ -109,4 +73,104 @@ final class TicketPendingConfirmReconcileService
return $summary;
}
private function confirmOrder(TicketOrder $lockedOrder): string
{
$draw = Draw::query()->whereKey($lockedOrder->draw_id)->first();
if ($draw === null || ! $this->drawHallSnapshot->isBettingOpen($draw)) {
return $this->refundStalePendingOrder(
$lockedOrder,
$draw === null ? 'draw_missing' : 'draw_no_longer_open',
);
}
$items = TicketItem::query()
->where('order_id', $lockedOrder->id)
->where('status', 'pending_confirm')
->lockForUpdate()
->get();
foreach ($items as $item) {
$item->forceFill([
'status' => 'pending_draw',
'fail_reason_code' => null,
'fail_reason_text' => null,
])->save();
$this->jackpotContribution->recordFromPlacedTicketItem($item, $draw, (string) $lockedOrder->currency_code);
}
$hasFailures = TicketItem::query()
->where('order_id', $lockedOrder->id)
->where('status', 'failed')
->exists();
$lockedOrder->forceFill([
'status' => $hasFailures ? 'partial_failed' : 'placed',
])->save();
return 'confirmed';
}
private function refundStalePendingOrder(TicketOrder $lockedOrder, string $reasonCode): string
{
$hasPostedDeduct = WalletTxn::query()
->where('biz_type', 'bet_deduct')
->where('biz_no', $lockedOrder->order_no)
->where('status', 'posted')
->exists();
if ($hasPostedDeduct) {
$this->ticketWallet->reverseBetDeduct($lockedOrder);
}
return $this->refundPendingConfirmItems($lockedOrder, $reasonCode);
}
private function refundOrderWithoutDeduct(TicketOrder $lockedOrder): string
{
return $this->refundPendingConfirmItems($lockedOrder, 'pending_confirm_timeout');
}
private function refundPendingConfirmItems(TicketOrder $lockedOrder, string $reasonCode): string
{
$items = TicketItem::query()
->where('order_id', $lockedOrder->id)
->where('status', 'pending_confirm')
->with('combinations')
->lockForUpdate()
->get();
foreach ($items as $item) {
$locks = [];
foreach ($item->combinations as $combo) {
$locks[] = [
'number_4d' => (string) $combo->number_4d,
'amount' => (int) $combo->estimated_payout,
];
}
if ($locks !== []) {
$this->riskPool->release((int) $lockedOrder->draw_id, $item, $locks);
}
$item->forceFill([
'status' => 'refunded',
'fail_reason_code' => $reasonCode,
'fail_reason_text' => $reasonCode.'_refund',
'risk_locked_amount' => 0,
])->save();
}
$hasFailures = TicketItem::query()
->where('order_id', $lockedOrder->id)
->where('status', 'failed')
->exists();
$lockedOrder->forceFill([
'status' => $hasFailures ? 'partial_failed' : 'refunded',
])->save();
return 'refunded';
}
}