feat: 增强代理结算和账单管理功能
- 在多个控制器中引入 SettlementPartyEnrichment 服务，以优化代理结算和账单的处理逻辑。 - 更新 AgentSettlementBillIndexController 和 AgentSettlementBillShowController，支持根据账单 ID 和关键字进行查询。 - 在 AgentSettlementPeriodCloseController 中添加对站点管理权限的验证，确保只有具备相应权限的管理员能够关闭账期。 - 在 AgentSettlementPeriodIndexController 中更新账期数据的返回格式，提升数据的完整性和可用性。 - 引入对相对占成比例的支持，增强代理资料的管理能力，确保数据一致性。
This commit is contained in:
@@ -4,6 +4,7 @@ namespace App\Services\AgentSettlement;
|
||||
|
||||
use App\Models\AdminUser;
|
||||
use App\Support\AdminAgentSettlementScope;
|
||||
use App\Support\AdminDataScope;
|
||||
use Illuminate\Database\Query\Builder;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -39,12 +40,15 @@ final class AgentSettlementReportQueryService
|
||||
{
|
||||
$siteCode = $this->siteCodeForAdmin($admin, $periodId);
|
||||
|
||||
return DB::table('share_ledger as sl')
|
||||
$query = DB::table('share_ledger as sl')
|
||||
->join('players as p', 'p.id', '=', 'sl.player_id')
|
||||
->leftJoin('ticket_items as ti', 'ti.id', '=', 'sl.ticket_item_id')
|
||||
->where('p.site_code', $siteCode)
|
||||
->whereBetween('sl.settled_at', [$periodStart, $periodEnd])
|
||||
->whereNull('sl.reversal_of_id')
|
||||
->whereNull('sl.reversal_of_id');
|
||||
$this->applyPlayerSubtree($query, $admin, 'p');
|
||||
|
||||
return $query
|
||||
->groupBy('sl.player_id', 'p.username', 'p.agent_node_id', 'ti.play_code')
|
||||
->selectRaw('sl.player_id, p.username, p.agent_node_id, COALESCE(ti.play_code, ?) as game_type', ['*'])
|
||||
->selectRaw('SUM(sl.game_win_loss) as game_win_loss')
|
||||
@@ -69,11 +73,14 @@ final class AgentSettlementReportQueryService
|
||||
{
|
||||
$siteCode = $this->siteCodeForAdmin($admin, 0);
|
||||
|
||||
return DB::table('share_ledger as sl')
|
||||
$query = DB::table('share_ledger as sl')
|
||||
->join('players as p', 'p.id', '=', 'sl.player_id')
|
||||
->where('p.site_code', $siteCode)
|
||||
->whereBetween('sl.settled_at', [$periodStart, $periodEnd])
|
||||
->whereNull('sl.reversal_of_id')
|
||||
->whereNull('sl.reversal_of_id');
|
||||
$this->applyAgentSubtree($query, $admin, 'sl.agent_node_id');
|
||||
|
||||
return $query
|
||||
->groupBy('sl.agent_node_id')
|
||||
->selectRaw('sl.agent_node_id, SUM(sl.game_win_loss) as game_win_loss, SUM(sl.basic_rebate) as basic_rebate, COUNT(*) as entry_count')
|
||||
->orderByDesc('game_win_loss')
|
||||
@@ -97,26 +104,32 @@ final class AgentSettlementReportQueryService
|
||||
$base = DB::table('rebate_records as rr')
|
||||
->join('players as p', 'p.id', '=', 'rr.player_id')
|
||||
->where('p.site_code', $siteCode);
|
||||
$this->applyPlayerSubtree($base, $admin, 'p');
|
||||
|
||||
$accrued = (clone $base)->where('rr.status', 'accrued')->sum('rr.rebate_amount');
|
||||
$inBill = (clone $base)->where('rr.status', 'in_bill')->sum('rr.rebate_amount');
|
||||
$settled = (clone $base)->where('rr.status', 'settled')->sum('rr.rebate_amount');
|
||||
$allocated = (int) DB::table('rebate_allocations as ra')
|
||||
|
||||
$allocatedQuery = DB::table('rebate_allocations as ra')
|
||||
->join('rebate_records as rr', 'rr.id', '=', 'ra.rebate_record_id')
|
||||
->join('players as p', 'p.id', '=', 'rr.player_id')
|
||||
->where('p.site_code', $siteCode)
|
||||
->when($periodId > 0, fn (Builder $q) => $q->where('rr.settlement_period_id', $periodId))
|
||||
->sum('ra.allocated_amount');
|
||||
->when($periodId > 0, fn (Builder $q) => $q->where('rr.settlement_period_id', $periodId));
|
||||
$this->applyPlayerSubtree($allocatedQuery, $admin, 'p');
|
||||
$allocated = (int) $allocatedQuery->sum('ra.allocated_amount');
|
||||
|
||||
return [
|
||||
'accrued_total' => (int) $accrued,
|
||||
'in_bill_total' => (int) $inBill,
|
||||
'settled_total' => (int) $settled,
|
||||
'allocated_total' => $allocated,
|
||||
'by_type' => DB::table('rebate_records as rr')
|
||||
->join('players as p', 'p.id', '=', 'rr.player_id')
|
||||
->where('p.site_code', $siteCode)
|
||||
->whereBetween('rr.created_at', [$periodStart, $periodEnd])
|
||||
'by_type' => tap(
|
||||
DB::table('rebate_records as rr')
|
||||
->join('players as p', 'p.id', '=', 'rr.player_id')
|
||||
->where('p.site_code', $siteCode)
|
||||
->whereBetween('rr.created_at', [$periodStart, $periodEnd]),
|
||||
fn (Builder $q) => $this->applyPlayerSubtree($q, $admin, 'p'),
|
||||
)
|
||||
->groupBy('rr.rebate_type', 'rr.status')
|
||||
->selectRaw('rr.rebate_type, rr.status, SUM(rr.rebate_amount) as total, COUNT(*) as cnt')
|
||||
->get()
|
||||
@@ -137,10 +150,13 @@ final class AgentSettlementReportQueryService
|
||||
{
|
||||
$siteCode = $this->siteCodeForAdmin($admin, 0);
|
||||
|
||||
$agents = DB::table('agent_profiles as ap')
|
||||
$agentsQuery = DB::table('agent_profiles as ap')
|
||||
->join('agent_nodes as an', 'an.id', '=', 'ap.agent_node_id')
|
||||
->join('admin_sites as s', 's.id', '=', 'an.admin_site_id')
|
||||
->where('s.code', $siteCode)
|
||||
->where('s.code', $siteCode);
|
||||
$this->applyAgentSubtree($agentsQuery, $admin, 'ap.agent_node_id');
|
||||
|
||||
$agents = $agentsQuery
|
||||
->selectRaw('ap.agent_node_id, an.code, an.name, ap.credit_limit, ap.allocated_credit, (ap.credit_limit - ap.allocated_credit) as available_credit')
|
||||
->orderBy('an.depth')
|
||||
->get()
|
||||
@@ -154,9 +170,12 @@ final class AgentSettlementReportQueryService
|
||||
])
|
||||
->all();
|
||||
|
||||
$players = DB::table('player_credit_accounts as pc')
|
||||
$playersQuery = DB::table('player_credit_accounts as pc')
|
||||
->join('players as p', 'p.id', '=', 'pc.player_id')
|
||||
->where('p.site_code', $siteCode)
|
||||
->where('p.site_code', $siteCode);
|
||||
$this->applyPlayerSubtree($playersQuery, $admin, 'p');
|
||||
|
||||
$players = $playersQuery
|
||||
->selectRaw('pc.player_id, p.username, pc.credit_limit, pc.used_credit, pc.frozen_credit, (pc.credit_limit - pc.used_credit - pc.frozen_credit) as available_credit')
|
||||
->orderByDesc('pc.used_credit')
|
||||
->limit(500)
|
||||
@@ -287,13 +306,16 @@ final class AgentSettlementReportQueryService
|
||||
{
|
||||
$siteCode = $this->siteCodeForAdmin($admin, 0);
|
||||
|
||||
return DB::table('share_ledger as sl')
|
||||
$query = DB::table('share_ledger as sl')
|
||||
->join('ticket_items as ti', 'ti.id', '=', 'sl.ticket_item_id')
|
||||
->join('players as p', 'p.id', '=', 'sl.player_id')
|
||||
->join('draws as d', 'd.id', '=', 'ti.draw_id')
|
||||
->where('p.site_code', $siteCode)
|
||||
->whereBetween('sl.settled_at', [$periodStart, $periodEnd])
|
||||
->whereNull('sl.reversal_of_id')
|
||||
->whereNull('sl.reversal_of_id');
|
||||
$this->applyPlayerSubtree($query, $admin, 'p');
|
||||
|
||||
return $query
|
||||
->groupBy('ti.draw_id', 'd.draw_no')
|
||||
->selectRaw('ti.draw_id, d.draw_no, SUM(sl.game_win_loss) as game_win_loss, SUM(sl.basic_rebate) as basic_rebate, COUNT(*) as ticket_count')
|
||||
->orderBy('d.draw_no')
|
||||
@@ -308,6 +330,27 @@ final class AgentSettlementReportQueryService
|
||||
->all();
|
||||
}
|
||||
|
||||
private function applyPlayerSubtree(Builder $query, AdminUser $admin, string $alias = 'p'): void
|
||||
{
|
||||
AdminDataScope::applyToPlayersAlias($query, $admin, $alias);
|
||||
}
|
||||
|
||||
private function applyAgentSubtree(Builder $query, AdminUser $admin, string $agentNodeColumn): void
|
||||
{
|
||||
$subtreeIds = AdminAgentSettlementScope::subtreeAgentNodeIds($admin);
|
||||
if ($subtreeIds === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ($subtreeIds === []) {
|
||||
$query->whereRaw('0 = 1');
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$query->whereIn($agentNodeColumn, $subtreeIds);
|
||||
}
|
||||
|
||||
private function siteCodeForAdmin(AdminUser $admin, int $periodId): string
|
||||
{
|
||||
if ($periodId > 0) {
|
||||
|
||||
Reference in New Issue
Block a user