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

feat: Enhance settlement and draw management functionality

Browse Source 
- Implement error handling for skipped settlement runs in DrawSettlementRunController, returning appropriate error messages based on draw status.
- Add validation in DrawPublishService to ensure draws are ready for publication, rejecting outdated result batches.
- Update SettlementBatchWorkflowService to revert ticket statuses upon settlement rejection and restore jackpot pool amounts.
- Refactor LotteryTransferService to improve transaction handling for transfer order reconciliation, ensuring idempotency during reversals.
- Add multi-language support for new error messages related to settlement processes.
This commit is contained in:
kang
2026-05-26 14:10:16 +08:00
parent e4118d7b1d
commit 48349e3302
10 changed files with 354 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
app/Services/Wallet/LotteryTransferService.php
View File

@@ -322,11 +322,35 @@ final class LotteryTransferService
string $action,
string $remark = '',
): void {
$allowedStatuses = $action === 'manually_process'
? [self::ST_PROCESSING, self::ST_FAILED, self::ST_PENDING_RECONCILE]
: [self::ST_PENDING_RECONCILE];
if ($action === 'reverse') {
DB::transaction(fn (): mixed => $this->doReverse($order, $remark));
if (! in_array($order->status, $allowedStatuses, true)) {
return;
}
if ($action === 'manually_process') {
DB::transaction(fn (): mixed => $this->doManuallyProcess($order, $remark));
return;
}
throw new WalletOperationException(
'invalid_reconcile_action',
ErrorCode::WalletExternalRejected->value,
422,
);
}
private function doReverse(TransferOrder $order, string $remark): void
{
/** @var TransferOrder $locked */
$locked = TransferOrder::query()->whereKey($order->id)->lockForUpdate()->firstOrFail();
if ($locked->status === self::ST_REVERSED) {
return;
}
if ($locked->status !== self::ST_PENDING_RECONCILE) {
throw new WalletOperationException(
'order_not_pending_reconcile',
ErrorCode::WalletExternalRejected->value,
@@ -334,54 +358,55 @@ final class LotteryTransferService
);
}
if ($action === 'reverse') {
$this->doReverse($order, $remark);
} elseif ($action === 'manually_process') {
$this->doManuallyProcess($order, $remark);
} else {
throw new WalletOperationException(
'invalid_reconcile_action',
ErrorCode::WalletExternalRejected->value,
422,
);
}
}
if ($locked->direction === self::DIR_OUT) {
$idempotentKey = 'reversal:'.$locked->transfer_no;
$alreadyCredited = WalletTxn::query()
->where('idempotent_key', $idempotentKey)
->where('biz_type', self::BIZ_REVERSAL)
->exists();
private function doReverse(TransferOrder $order, string $remark): void
{
if ($order->direction === self::DIR_OUT) {
DB::transaction(function () use ($order, $remark): void {
$wallet = $this->lockLotteryWalletById($order->player_id, $order->currency_code);
if (! $alreadyCredited) {
$wallet = $this->lockLotteryWalletById($locked->player_id, $locked->currency_code);
$this->postLotteryWalletMovement(
wallet: $wallet,
bizType: self::BIZ_REVERSAL,
direction: self::TXN_DIR_IN,
amountMinor: (int) $order->amount,
bizNo: $order->transfer_no,
amountMinor: (int) $locked->amount,
bizNo: $locked->transfer_no,
externalRefNo: null,
idempotentKey: null,
idempotentKey: $idempotentKey,
remark: $remark ?: 'reversal_pending_reconcile',
deltaSign: 1,
);
$order->forceFill([
'status' => self::ST_REVERSED,
'fail_reason' => 'reversed: '.($remark ?: 'admin_reversal'),
'finished_at' => now(),
])->save();
});
} else {
$order->forceFill([
'status' => self::ST_REVERSED,
'fail_reason' => 'reversed: '.($remark ?: 'admin_reversal'),
'finished_at' => now(),
])->save();
}
}
$locked->forceFill([
'status' => self::ST_REVERSED,
'fail_reason' => 'reversed: '.($remark ?: 'admin_reversal'),
'finished_at' => now(),
])->save();
}
private function doManuallyProcess(TransferOrder $order, string $remark): void
{
$order->forceFill([
/** @var TransferOrder $locked */
$locked = TransferOrder::query()->whereKey($order->id)->lockForUpdate()->firstOrFail();
$allowedStatuses = [self::ST_PROCESSING, self::ST_FAILED, self::ST_PENDING_RECONCILE];
if (! in_array($locked->status, $allowedStatuses, true)) {
throw new WalletOperationException(
'order_not_pending_reconcile',
ErrorCode::WalletExternalRejected->value,
422,
);
}
if ($locked->status === self::ST_MANUALLY_PROCESSED) {
return;
}
$locked->forceFill([
'status' => self::ST_MANUALLY_PROCESSED,
'fail_reason' => 'manually_processed: '.($remark ?: 'admin_manual'),
'finished_at' => now(),