feat(agent-profile): 限制代理及玩家返点和分成范围,增强权限校验
- 添加ensureSuperAdmin方法,限制管理员设置操作权限 - 在AdminSettingController接口中新增权限检查,防止非超级管理员操作 - AdminPlayerIndexController新增direct agent筛选支持 - AdminPlayerUpdateController新增对信用玩家默认币别变更的拒绝逻辑 - 新增WalletSettlementBillsController,实现玩家信用盘账期账单摘要接口 - AgentProfileService调整,新增返点限额和分享比例自动下调机制,保持子代理及玩家配置不超父级 - AgentProfileService增加can_grant_extra_rebate权限继承限制,阻止无权限代理开启 - AgentSettlementPeriodCloseService增加玩家账单回水信用释放逻辑,确保信用额度同步 - PlayerCreditService新增释放账单回水对应信用逻辑,维护账期信用一致性 - TicketPlacementService和TicketPreviewService新增信用玩家投注币别匹配校验,防止币别不符 - PlayerLedgerLogsService优化信用额度计算,增加可用额度上下限限制,防止负值和超限 - 调整后台管理导航,仅超管可见设置入口,强化权限隔离 - 路由新增玩家信用账单查询接口 - 补充多项AgentProfile相关单元测试覆盖额度限制、返点继承、返点下调场景及权限限制 - 增加站点管理员登录测试,验证系统设置菜单不可见,提升用户权限体验
This commit is contained in:
@@ -182,12 +182,19 @@ final class PlayerLedgerLogsService
|
||||
$offset = max(0, ($page - 1) * $perPage);
|
||||
$pageRows = array_slice($simplified, $offset, $perPage);
|
||||
|
||||
$runningMinor = $this->playerCreditService->availableCreditMinor($player, $currency);
|
||||
$creditLimitMinor = $this->creditLimitMinor($player, $currency);
|
||||
$runningMinor = $this->clampCreditAvailableMinor(
|
||||
$this->playerCreditService->availableCreditMinor($player, $currency),
|
||||
$creditLimitMinor,
|
||||
);
|
||||
foreach (array_slice($simplified, 0, $offset) as $priorRow) {
|
||||
if (! $this->adminCreditRowAffectsAvailableBalance($priorRow)) {
|
||||
continue;
|
||||
}
|
||||
$runningMinor -= $this->adminCreditRowSignedDelta($priorRow);
|
||||
$runningMinor = $this->clampCreditAvailableMinor(
|
||||
$runningMinor - $this->adminCreditRowSignedDelta($priorRow),
|
||||
$creditLimitMinor,
|
||||
);
|
||||
}
|
||||
$items = [];
|
||||
foreach ($pageRows as $formatted) {
|
||||
@@ -208,9 +215,9 @@ final class PlayerLedgerLogsService
|
||||
'balance_after_formatted' => CurrencyFormatter::fromMinor($runningMinor),
|
||||
'balance_before' => $signed >= 0
|
||||
? max(0, $runningMinor - $signed)
|
||||
: $runningMinor + abs($signed),
|
||||
: $this->clampCreditAvailableMinor($runningMinor + abs($signed), $creditLimitMinor),
|
||||
]);
|
||||
$runningMinor -= $signed;
|
||||
$runningMinor = $this->clampCreditAvailableMinor($runningMinor - $signed, $creditLimitMinor);
|
||||
}
|
||||
|
||||
return [
|
||||
@@ -449,14 +456,16 @@ final class PlayerLedgerLogsService
|
||||
->slice(0, $offset)
|
||||
->filter(fn (object $entry): bool => $entry->source === 'credit')
|
||||
->count();
|
||||
$creditLimitMinor = $this->creditLimitMinor($player, $currency);
|
||||
$runningMinor = $this->advanceCreditLedgerRunningMinor(
|
||||
(int) $player->id,
|
||||
$reasonFilter,
|
||||
$this->playerCreditService->availableCreditMinor($player, $currency),
|
||||
$priorCreditRows,
|
||||
$creditLimitMinor,
|
||||
);
|
||||
$items = $pageRows
|
||||
->map(function (object $entry) use (&$runningMinor, $player, $currency): array {
|
||||
->map(function (object $entry) use (&$runningMinor, $player, $currency, $creditLimitMinor): array {
|
||||
if ($entry->source === 'rebate') {
|
||||
return $this->formatPlayerRebateRow($entry->row, $player, $currency);
|
||||
}
|
||||
@@ -473,7 +482,7 @@ final class PlayerLedgerLogsService
|
||||
$affectsBalance,
|
||||
);
|
||||
if ($affectsBalance) {
|
||||
$runningMinor -= $amount;
|
||||
$runningMinor = $this->clampCreditAvailableMinor($runningMinor - $amount, $creditLimitMinor);
|
||||
}
|
||||
|
||||
return $formatted;
|
||||
@@ -694,7 +703,10 @@ final class PlayerLedgerLogsService
|
||||
?array $reasonFilter,
|
||||
int $runningMinor,
|
||||
int $skipRows,
|
||||
int $creditLimitMinor,
|
||||
): int {
|
||||
$runningMinor = $this->clampCreditAvailableMinor($runningMinor, $creditLimitMinor);
|
||||
|
||||
if ($skipRows <= 0) {
|
||||
return $runningMinor;
|
||||
}
|
||||
@@ -707,12 +719,27 @@ final class PlayerLedgerLogsService
|
||||
if (! $this->creditReasonAffectsAvailableBalance((string) $row->reason)) {
|
||||
continue;
|
||||
}
|
||||
$runningMinor -= (int) $row->amount;
|
||||
$runningMinor = $this->clampCreditAvailableMinor($runningMinor - (int) $row->amount, $creditLimitMinor);
|
||||
}
|
||||
|
||||
return $runningMinor;
|
||||
}
|
||||
|
||||
private function creditLimitMinor(Player $player, string $currency): int
|
||||
{
|
||||
$credit = DB::table('player_credit_accounts')->where('player_id', $player->id)->first();
|
||||
if ($credit === null) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return \App\Support\CreditAmountScale::majorToMinor((int) $credit->credit_limit, $currency);
|
||||
}
|
||||
|
||||
private function clampCreditAvailableMinor(int $amountMinor, int $creditLimitMinor): int
|
||||
{
|
||||
return min(max(0, $amountMinor), max(0, $creditLimitMinor));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $formatted
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user