feat: 增强奖池与钱包服务的多币种支持能力
更新 JackpotManualBurstService:在解析头奖中奖者时支持币种代码处理。 重构 SettlementBatchWorkflowService:按币种聚合玩家派奖金额,确保各币种结算准确入账。 修改 SettlementOrchestrator:按币种分别处理奖池爆奖流程,提升派奖准确性。 优化 TicketWalletService:在派奖幂等键中加入币种信息,避免多币种场景下的重复处理问题。 新增测试用例,验证多币种派奖场景及待处理交易的正确处理逻辑。
This commit is contained in:
@@ -377,6 +377,212 @@ test('admin can complete stuck transfer in credit for pending reconcile order',
|
||||
->and(WalletTxn::query()->where('biz_type', 'transfer_in')->count())->toBe(1);
|
||||
});
|
||||
|
||||
test('admin complete-credit is idempotent and does not double credit wallet', function (): void {
|
||||
$token = makeAdminToken();
|
||||
|
||||
$player = Player::query()->create([
|
||||
'site_code' => 'main',
|
||||
'site_player_id' => 'complete-credit-idem-player',
|
||||
'username' => null,
|
||||
'nickname' => null,
|
||||
'default_currency' => 'NPR',
|
||||
'status' => 0,
|
||||
]);
|
||||
|
||||
$wallet = PlayerWallet::query()->create([
|
||||
'player_id' => $player->id,
|
||||
'wallet_type' => 'lottery',
|
||||
'currency_code' => 'NPR',
|
||||
'balance' => 300,
|
||||
'frozen_balance' => 0,
|
||||
'status' => 0,
|
||||
'version' => 0,
|
||||
]);
|
||||
|
||||
TransferOrder::query()->create([
|
||||
'transfer_no' => 'TI_complete_credit_idem',
|
||||
'player_id' => $player->id,
|
||||
'direction' => 'in',
|
||||
'currency_code' => 'NPR',
|
||||
'amount' => 700,
|
||||
'idempotent_key' => 'complete-credit-idem-key',
|
||||
'status' => 'pending_reconcile',
|
||||
'external_request_payload' => ['ok' => true],
|
||||
'external_response_payload' => ['ok' => true],
|
||||
'external_ref_no' => 'main-ref-idem-1',
|
||||
'fail_reason' => 'lottery_credit_failed',
|
||||
'finished_at' => null,
|
||||
]);
|
||||
|
||||
$path = '/api/v1/admin/wallet/transfer-orders/TI_complete_credit_idem/complete-credit';
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson($path, ['remark' => 'first'])
|
||||
->assertOk()
|
||||
->assertJsonPath('data.status', 'success');
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson($path, ['remark' => 'second'])
|
||||
->assertOk()
|
||||
->assertJsonPath('data.status', 'success');
|
||||
|
||||
$wallet->refresh();
|
||||
expect((int) $wallet->balance)->toBe(1_000)
|
||||
->and(WalletTxn::query()->where('biz_type', 'transfer_in')->where('biz_no', 'TI_complete_credit_idem')->count())->toBe(1)
|
||||
->and(TransferOrder::query()->where('transfer_no', 'TI_complete_credit_idem')->value('status'))->toBe('success');
|
||||
});
|
||||
|
||||
test('admin complete-credit rejects ineligible pending reconcile order', function (): void {
|
||||
$token = makeAdminToken();
|
||||
|
||||
$player = Player::query()->create([
|
||||
'site_code' => 'main',
|
||||
'site_player_id' => 'complete-credit-ineligible-player',
|
||||
'username' => null,
|
||||
'nickname' => null,
|
||||
'default_currency' => 'NPR',
|
||||
'status' => 0,
|
||||
]);
|
||||
|
||||
PlayerWallet::query()->create([
|
||||
'player_id' => $player->id,
|
||||
'wallet_type' => 'lottery',
|
||||
'currency_code' => 'NPR',
|
||||
'balance' => 100,
|
||||
'frozen_balance' => 0,
|
||||
'status' => 0,
|
||||
'version' => 0,
|
||||
]);
|
||||
|
||||
TransferOrder::query()->create([
|
||||
'transfer_no' => 'TI_complete_credit_ineligible',
|
||||
'player_id' => $player->id,
|
||||
'direction' => 'in',
|
||||
'currency_code' => 'NPR',
|
||||
'amount' => 500,
|
||||
'idempotent_key' => 'complete-credit-ineligible-key',
|
||||
'status' => 'pending_reconcile',
|
||||
'external_request_payload' => ['ok' => true],
|
||||
'external_response_payload' => ['ok' => true],
|
||||
'external_ref_no' => null,
|
||||
'fail_reason' => 'main_site_timeout',
|
||||
'finished_at' => null,
|
||||
]);
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson('/api/v1/admin/wallet/transfer-orders/TI_complete_credit_ineligible/complete-credit', [
|
||||
'remark' => 'should fail',
|
||||
])
|
||||
->assertStatus(422);
|
||||
|
||||
expect((int) PlayerWallet::query()->where('player_id', $player->id)->value('balance'))->toBe(100)
|
||||
->and(WalletTxn::query()->where('biz_no', 'TI_complete_credit_ineligible')->count())->toBe(0);
|
||||
});
|
||||
|
||||
test('admin reverse endpoint is idempotent and credits only once', function (): void {
|
||||
$token = makeAdminToken();
|
||||
|
||||
$player = Player::query()->create([
|
||||
'site_code' => 'main',
|
||||
'site_player_id' => 'reverse-endpoint-idem-player',
|
||||
'username' => null,
|
||||
'nickname' => null,
|
||||
'default_currency' => 'NPR',
|
||||
'status' => 0,
|
||||
]);
|
||||
|
||||
$wallet = PlayerWallet::query()->create([
|
||||
'player_id' => $player->id,
|
||||
'wallet_type' => 'lottery',
|
||||
'currency_code' => 'NPR',
|
||||
'balance' => 600,
|
||||
'frozen_balance' => 0,
|
||||
'status' => 0,
|
||||
'version' => 0,
|
||||
]);
|
||||
|
||||
TransferOrder::query()->create([
|
||||
'transfer_no' => 'TO_reverse_endpoint_idem',
|
||||
'player_id' => $player->id,
|
||||
'direction' => 'out',
|
||||
'currency_code' => 'NPR',
|
||||
'amount' => 200,
|
||||
'idempotent_key' => 'reverse-endpoint-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,
|
||||
]);
|
||||
|
||||
WalletTxn::query()->create([
|
||||
'txn_no' => 'WX_reverse_endpoint_out',
|
||||
'player_id' => $player->id,
|
||||
'wallet_id' => $wallet->id,
|
||||
'biz_type' => 'transfer_out',
|
||||
'biz_no' => 'TO_reverse_endpoint_idem',
|
||||
'direction' => 2,
|
||||
'amount' => 200,
|
||||
'balance_before' => 800,
|
||||
'balance_after' => 600,
|
||||
'status' => 'pending_reconcile',
|
||||
'external_ref_no' => null,
|
||||
'idempotent_key' => 'reverse-endpoint-idem-key',
|
||||
'remark' => null,
|
||||
]);
|
||||
|
||||
$path = '/api/v1/admin/wallet/transfer-orders/TO_reverse_endpoint_idem/reverse';
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson($path, ['remark' => 'first'])
|
||||
->assertOk()
|
||||
->assertJsonPath('data.status', 'reversed');
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson($path, ['remark' => 'second'])
|
||||
->assertOk()
|
||||
->assertJsonPath('data.status', 'reversed');
|
||||
|
||||
$wallet->refresh();
|
||||
expect((int) $wallet->balance)->toBe(800)
|
||||
->and(TransferOrder::query()->where('transfer_no', 'TO_reverse_endpoint_idem')->value('status'))->toBe('reversed')
|
||||
->and(WalletTxn::query()->where('biz_type', 'reversal')->where('biz_no', 'TO_reverse_endpoint_idem')->count())->toBe(1);
|
||||
});
|
||||
|
||||
test('admin manually-process rejects pending reconcile transfer-out', function (): void {
|
||||
$token = makeAdminToken();
|
||||
|
||||
$player = Player::query()->create([
|
||||
'site_code' => 'main',
|
||||
'site_player_id' => 'manual-process-out-pending-player',
|
||||
'username' => null,
|
||||
'nickname' => null,
|
||||
'default_currency' => 'NPR',
|
||||
'status' => 0,
|
||||
]);
|
||||
|
||||
TransferOrder::query()->create([
|
||||
'transfer_no' => 'TO_manual_process_pending_out',
|
||||
'player_id' => $player->id,
|
||||
'direction' => 'out',
|
||||
'currency_code' => 'NPR',
|
||||
'amount' => 200,
|
||||
'idempotent_key' => 'manual-process-pending-out-key',
|
||||
'status' => 'pending_reconcile',
|
||||
'external_request_payload' => null,
|
||||
'external_response_payload' => null,
|
||||
'external_ref_no' => null,
|
||||
'fail_reason' => 'main_site_timeout',
|
||||
'finished_at' => null,
|
||||
]);
|
||||
|
||||
$this->withHeader('Authorization', 'Bearer '.$token)
|
||||
->postJson('/api/v1/admin/wallet/transfer-orders/TO_manual_process_pending_out/manually-process', [
|
||||
'remark' => 'should reject',
|
||||
])
|
||||
->assertStatus(422)
|
||||
->assertJsonPath('code', ErrorCode::WalletExternalRejected->value);
|
||||
});
|
||||
|
||||
test('admin shows player wallets', function (): void {
|
||||
$token = makeAdminToken();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user