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:
@@ -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();
|
||||
|
||||
|
||||
@@ -654,6 +654,8 @@ test('cooldown expiry tick moves draw to settling', function (): void {
|
||||
]);
|
||||
LotterySettings::put('draw.require_manual_review', false, 'draw', 'RNG 开奖后是否必须进入人工审核');
|
||||
LotterySettings::put('draw.cooldown_minutes', 15, 'draw', '开奖结果发布后的冷静期分钟数');
|
||||
LotterySettings::put('settlement.auto_approve_on_tick', false, 'settlement', '本用例仅验证进入结算态,不自动审核派彩');
|
||||
LotterySettings::put('settlement.auto_payout_on_tick', false, 'settlement', '本用例仅验证进入结算态,不自动派彩');
|
||||
Carbon::setTestNow(Carbon::parse('2026-05-09 14:07:00', 'UTC'));
|
||||
|
||||
$drawTime = now()->copy()->subMinute();
|
||||
|
||||
@@ -279,3 +279,135 @@ test('admin settlement requires review before payout and can export report', fun
|
||||
->assertOk()
|
||||
->assertHeader('content-type', 'text/csv; charset=UTF-8');
|
||||
});
|
||||
|
||||
test('settlement reject reverts tickets to pending_draw and allows re-settlement', function (): void {
|
||||
$uniq = bin2hex(random_bytes(4));
|
||||
$player = Player::query()->create([
|
||||
'site_code' => 'test',
|
||||
'site_player_id' => 'settle-reject-p-'.$uniq,
|
||||
'username' => 'srp_'.$uniq,
|
||||
'nickname' => null,
|
||||
'default_currency' => 'NPR',
|
||||
'status' => 0,
|
||||
]);
|
||||
PlayerWallet::query()->create([
|
||||
'player_id' => $player->id,
|
||||
'wallet_type' => 'lottery',
|
||||
'currency_code' => 'NPR',
|
||||
'balance' => 5_000_000,
|
||||
'frozen_balance' => 0,
|
||||
'status' => 0,
|
||||
'version' => 0,
|
||||
]);
|
||||
|
||||
$draw = Draw::query()->create([
|
||||
'draw_no' => '20260511-902',
|
||||
'business_date' => '2026-05-11',
|
||||
'sequence_no' => 902,
|
||||
'status' => DrawStatus::Open->value,
|
||||
'start_time' => now()->subMinutes(2),
|
||||
'close_time' => now()->addMinutes(5),
|
||||
'draw_time' => now()->addMinutes(6),
|
||||
'cooling_end_time' => null,
|
||||
'result_source' => null,
|
||||
'current_result_version' => 0,
|
||||
'settle_version' => 0,
|
||||
'is_reopened' => false,
|
||||
]);
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer dev:'.$player->id)
|
||||
->postJson('/api/v1/ticket/place', [
|
||||
'draw_id' => '20260511-902',
|
||||
'currency_code' => 'NPR',
|
||||
'client_trace_id' => 'settle-reject-trace-1',
|
||||
'lines' => [
|
||||
['number' => '1234', 'play_code' => 'big', 'amount' => 10_000],
|
||||
],
|
||||
])
|
||||
->assertOk();
|
||||
|
||||
$batch = DrawResultBatch::query()->create([
|
||||
'draw_id' => $draw->id,
|
||||
'result_version' => 1,
|
||||
'source_type' => 'rng',
|
||||
'rng_seed_hash' => 'reject-test',
|
||||
'raw_seed_encrypted' => null,
|
||||
'status' => DrawResultBatchStatus::Published->value,
|
||||
'created_by' => null,
|
||||
'confirmed_by' => null,
|
||||
'confirmed_at' => now(),
|
||||
]);
|
||||
|
||||
foreach (DrawPrizeLayout::slots() as $slot) {
|
||||
$num = $slot['prize_type'] === 'first' ? '1234' : '5678';
|
||||
DrawResultItem::query()->create([
|
||||
'draw_id' => $draw->id,
|
||||
'result_batch_id' => $batch->id,
|
||||
'prize_type' => $slot['prize_type'],
|
||||
'prize_index' => $slot['prize_index'],
|
||||
'number_4d' => $num,
|
||||
'suffix_3d' => substr($num, -3),
|
||||
'suffix_2d' => substr($num, -2),
|
||||
'head_digit' => (int) substr($num, 0, 1),
|
||||
'tail_digit' => (int) substr($num, 3, 1),
|
||||
]);
|
||||
}
|
||||
|
||||
$draw->forceFill([
|
||||
'status' => DrawStatus::Settling->value,
|
||||
'current_result_version' => 1,
|
||||
])->save();
|
||||
|
||||
$admin = AdminUser::query()->create([
|
||||
'username' => 'settlement_reject_reviewer',
|
||||
'name' => 'Settlement Reject Reviewer',
|
||||
'email' => null,
|
||||
'password' => Hash::make('secret-strong'),
|
||||
'status' => 0,
|
||||
]);
|
||||
grantSuperAdminRole($admin);
|
||||
$token = $admin->createToken('test', ['*'], now()->addDay())->plainTextToken;
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson("/api/v1/admin/draws/{$draw->id}/settlement/run")
|
||||
->assertOk();
|
||||
|
||||
$settlement = SettlementBatch::query()->where('draw_id', $draw->id)->firstOrFail();
|
||||
$item = TicketItem::query()->where('draw_id', $draw->id)->firstOrFail();
|
||||
expect($item->status)->toBe('pending_payout');
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson("/api/v1/admin/settlement-batches/{$settlement->id}/reject", ['remark' => 'wrong result'])
|
||||
->assertOk()
|
||||
->assertJsonPath('data.review_status', 'rejected');
|
||||
|
||||
$item->refresh();
|
||||
expect($item->status)->toBe('pending_draw')
|
||||
->and((int) $item->win_amount)->toBe(0);
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson("/api/v1/admin/draws/{$draw->id}/settlement/run")
|
||||
->assertOk()
|
||||
->assertJsonPath('data.ran', true);
|
||||
|
||||
$second = SettlementBatch::query()
|
||||
->where('draw_id', $draw->id)
|
||||
->where('status', 'pending_review')
|
||||
->orderByDesc('id')
|
||||
->firstOrFail();
|
||||
|
||||
expect((int) $second->id)->toBeGreaterThan((int) $settlement->id);
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson("/api/v1/admin/settlement-batches/{$second->id}/approve")
|
||||
->assertOk();
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson("/api/v1/admin/settlement-batches/{$second->id}/payout")
|
||||
->assertOk();
|
||||
|
||||
$item->refresh();
|
||||
$draw->refresh();
|
||||
expect($item->status)->toBe('settled_win')
|
||||
->and($draw->status)->toBe(DrawStatus::Settled->value);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user