feat: Enhance settlement and draw management functionality

- 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:
2026-05-26 14:10:16 +08:00
parent e4118d7b1d
commit 48349e3302
10 changed files with 354 additions and 43 deletions

View File

@@ -6,6 +6,7 @@ use App\Models\WalletTxn;
use App\Lottery\ErrorCode;
use App\Models\PlayerWallet;
use App\Models\TransferOrder;
use App\Services\Wallet\LotteryTransferService;
use Illuminate\Support\Facades\Hash;
use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -278,6 +279,53 @@ test('admin lists wallet transactions and filters abnormal', function (): void {
->assertJsonPath('data.items.0.status', 'pending_reconcile');
});
test('admin transfer reverse is idempotent under concurrent reconcile', function (): void {
$player = Player::query()->create([
'site_code' => 'main',
'site_player_id' => 'reverse-idem',
'username' => null,
'nickname' => null,
'default_currency' => 'NPR',
'status' => 0,
]);
$wallet = PlayerWallet::query()->create([
'player_id' => $player->id,
'wallet_type' => 'lottery',
'currency_code' => 'NPR',
'balance' => 1_000,
'frozen_balance' => 0,
'status' => 0,
'version' => 0,
]);
$order = TransferOrder::query()->create([
'transfer_no' => 'TI_reverse_idem',
'player_id' => $player->id,
'direction' => 'out',
'currency_code' => 'NPR',
'amount' => 400,
'idempotent_key' => 'reverse-idem-key',
'status' => 'pending_reconcile',
'external_request_payload' => null,
'external_response_payload' => null,
'external_ref_no' => null,
'fail_reason' => 'main_site_timeout',
'finished_at' => null,
]);
$service = app(LotteryTransferService::class);
$service->reconcileTransferOrder($order, 'reverse', 'first');
$service->reconcileTransferOrder($order->fresh(), 'reverse', 'second');
$wallet->refresh();
$order->refresh();
expect((int) $wallet->balance)->toBe(1_400)
->and($order->status)->toBe('reversed')
->and(WalletTxn::query()->where('biz_type', 'reversal')->count())->toBe(1);
});
test('admin shows player wallets', function (): void {
$token = makeAdminToken();