feat(wallet): 增强资金流水和信用账本的公共类型过滤，支持游戏结算和账单结算
This commit is contained in:
@@ -34,12 +34,14 @@ final class PlayerLedgerLogsService
|
||||
|
||||
/** PRD 对外类型 → credit_ledger.reason（信用盘不用钱包「派彩」口径） */
|
||||
private const CREDIT_TYPE_TO_REASON = [
|
||||
'bet' => ['bet_hold', 'game_settlement_loss'],
|
||||
'bet' => ['bet_hold'],
|
||||
'game_settlement' => ['bet_hold_release', 'game_settlement_loss', 'game_settlement_win', 'game_settlement_reversal'],
|
||||
'reversal' => ['bet_hold_release', 'game_settlement_reversal'],
|
||||
'refund' => ['settlement_confirm'],
|
||||
'win_credit' => ['game_settlement_win'],
|
||||
'credit_release' => ['game_settlement_win', 'settlement_confirm', 'bet_hold_release'],
|
||||
'bill_settlement' => ['settlement_payout'],
|
||||
'bill_settlement' => ['settlement_confirm', 'settlement_payout'],
|
||||
'rebate' => [],
|
||||
'transfer_in' => [],
|
||||
'transfer_out' => [],
|
||||
];
|
||||
@@ -423,24 +425,43 @@ final class PlayerLedgerLogsService
|
||||
string $typeFilterRaw,
|
||||
): array {
|
||||
$reasonFilter = $this->resolveCreditReasonFilter($typeFilterRaw);
|
||||
$includeRebates = $this->creditFilterIncludesRebates($typeFilterRaw);
|
||||
|
||||
if (is_array($reasonFilter) && $reasonFilter === []) {
|
||||
if (is_array($reasonFilter) && $reasonFilter === [] && ! $includeRebates) {
|
||||
return ['items' => [], 'total' => 0, 'page' => $page, 'per_page' => $perPage];
|
||||
}
|
||||
|
||||
$paginator = $this->creditLedgerQuery((int) $player->id, $reasonFilter)
|
||||
->paginate($perPage, ['*'], 'page', $page);
|
||||
|
||||
$currency = (string) $player->default_currency;
|
||||
$skipRows = max(0, ($paginator->currentPage() - 1) * $paginator->perPage());
|
||||
$creditRows = is_array($reasonFilter) && $reasonFilter === []
|
||||
? collect()
|
||||
: $this->creditLedgerQuery((int) $player->id, $reasonFilter)->get();
|
||||
$rebateRows = $includeRebates ? $this->rebateRecordRows((int) $player->id) : collect();
|
||||
$rows = $creditRows
|
||||
->map(fn (object $row): object => (object) ['source' => 'credit', 'row' => $row])
|
||||
->concat($rebateRows->map(fn (object $row): object => (object) ['source' => 'rebate', 'row' => $row]))
|
||||
->sortByDesc(fn (object $entry): string => (string) ($entry->row->created_at ?? ''))
|
||||
->values();
|
||||
|
||||
$total = $rows->count();
|
||||
$offset = max(0, ($page - 1) * $perPage);
|
||||
$pageRows = $rows->slice($offset, $perPage)->values();
|
||||
$priorCreditRows = $rows
|
||||
->slice(0, $offset)
|
||||
->filter(fn (object $entry): bool => $entry->source === 'credit')
|
||||
->count();
|
||||
$runningMinor = $this->advanceCreditLedgerRunningMinor(
|
||||
(int) $player->id,
|
||||
$reasonFilter,
|
||||
$this->playerCreditService->availableCreditMinor($player, $currency),
|
||||
$skipRows,
|
||||
$priorCreditRows,
|
||||
);
|
||||
$items = $paginator->getCollection()
|
||||
->map(function (object $row) use (&$runningMinor, $player, $currency): array {
|
||||
$items = $pageRows
|
||||
->map(function (object $entry) use (&$runningMinor, $player, $currency): array {
|
||||
if ($entry->source === 'rebate') {
|
||||
return $this->formatPlayerRebateRow($entry->row, $player, $currency);
|
||||
}
|
||||
|
||||
$row = $entry->row;
|
||||
$amount = (int) $row->amount;
|
||||
$reason = (string) $row->reason;
|
||||
$affectsBalance = $this->creditReasonAffectsAvailableBalance($reason);
|
||||
@@ -462,9 +483,9 @@ final class PlayerLedgerLogsService
|
||||
|
||||
return [
|
||||
'items' => $items,
|
||||
'total' => $paginator->total(),
|
||||
'page' => $paginator->currentPage(),
|
||||
'per_page' => $paginator->perPage(),
|
||||
'total' => $total,
|
||||
'page' => $page,
|
||||
'per_page' => $perPage,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -501,6 +522,18 @@ final class PlayerLedgerLogsService
|
||||
return $this->resolveTypeFilterMap($raw, self::CREDIT_TYPE_TO_REASON);
|
||||
}
|
||||
|
||||
private function creditFilterIncludesRebates(string $raw): bool
|
||||
{
|
||||
$raw = trim($raw);
|
||||
if ($raw === '') {
|
||||
return true;
|
||||
}
|
||||
|
||||
$parts = array_filter(array_map('trim', explode(',', $raw)));
|
||||
|
||||
return in_array('rebate', array_map(Str::lower(...), $parts), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, list<string>> $map
|
||||
* @return list<string>|null
|
||||
@@ -605,6 +638,48 @@ final class PlayerLedgerLogsService
|
||||
];
|
||||
}
|
||||
|
||||
private function rebateRecordRows(int $playerId)
|
||||
{
|
||||
return DB::table('rebate_records')
|
||||
->where('player_id', $playerId)
|
||||
->whereNull('reversal_of_id')
|
||||
->orderByDesc('created_at')
|
||||
->orderByDesc('id')
|
||||
->get();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private function formatPlayerRebateRow(object $row, Player $player, string $currency): array
|
||||
{
|
||||
$amount = (int) $row->rebate_amount;
|
||||
|
||||
return [
|
||||
'log_id' => 'RB-'.$row->id,
|
||||
'type' => 'rebate',
|
||||
'biz_type' => 'rebate_'.$row->status,
|
||||
'amount' => $amount,
|
||||
'amount_formatted' => CurrencyFormatter::fromMinor(abs($amount)),
|
||||
'amount_abs' => abs($amount),
|
||||
'amount_abs_formatted' => CurrencyFormatter::fromMinor(abs($amount)),
|
||||
'direction' => $amount >= 0 ? 'in' : 'out',
|
||||
'currency_code' => $currency,
|
||||
'balance_after' => null,
|
||||
'balance_after_formatted' => null,
|
||||
'affects_available_credit' => false,
|
||||
'ref_id' => 'ticket_item#'.$row->ticket_item_id,
|
||||
'idempotent_key' => null,
|
||||
'external_ref_no' => null,
|
||||
'status' => (string) $row->status,
|
||||
'remark' => 'period_rebate',
|
||||
'created_at' => $this->isoTimestamp($row->created_at ?? null),
|
||||
'ledger_source' => 'rebate_record',
|
||||
'funding_mode' => (string) ($player->funding_mode ?? PlayerFundingMode::CREDIT),
|
||||
'auth_source' => $player->auth_source,
|
||||
];
|
||||
}
|
||||
|
||||
/** 账期收付记账不改变 player_credit_accounts，不参与可用信用倒推。 */
|
||||
private function creditReasonAffectsAvailableBalance(string $reason): bool
|
||||
{
|
||||
@@ -702,10 +777,9 @@ final class PlayerLedgerLogsService
|
||||
private function creditReasonToPublicType(string $reason): string
|
||||
{
|
||||
return match ($reason) {
|
||||
'bet_hold', 'game_settlement_loss' => 'bet',
|
||||
'bet_hold_release', 'game_settlement_reversal' => 'reversal',
|
||||
'settlement_confirm' => 'refund',
|
||||
'game_settlement_win' => 'win_credit',
|
||||
'bet_hold' => 'bet',
|
||||
'bet_hold_release', 'game_settlement_loss', 'game_settlement_win', 'game_settlement_reversal' => 'game_settlement',
|
||||
'settlement_confirm' => 'bill_settlement',
|
||||
'settlement_payout' => 'bill_settlement',
|
||||
default => $reason,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user