xiaokang/lotteryLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 增强开奖列表统计功能

Browse Source 
- 在 AdminDrawIndexController 中新增 aggregateListStats 方法，聚合每个开奖的投注和派彩金额，计算盈亏情况。
- 更新 row 方法，使用聚合统计数据替代原有的直接查询，提升性能与可读性。
- 通过优化数据处理逻辑，确保在获取开奖列表时能够同时返回相关的统计信息。
This commit is contained in:
kang
2026-06-01 10:03:30 +08:00
parent 442b6dc758
commit 85d495e3b0
2 changed files with 112 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/Http/Controllers/Api/V1/Admin/Draw/AdminDrawIndexController.php
View File

@@ -37,7 +37,11 @@ final class AdminDrawIndexController extends Controller
/** @var LengthAwarePaginator $paginator */
$paginator = $q->paginate($p['perPage'], ['*'], 'page', $p['page']);
return AdminApiList::jsonWith($paginator, fn (Draw $row) => $this->row($row), [
$statsByDrawId = $this->aggregateListStats(
$paginator->getCollection()->pluck('id')->map(fn ($id) => (int) $id)->all(),
);
return AdminApiList::jsonWith($paginator, fn (Draw $row) => $this->row($row, $statsByDrawId), [
'schedule' => [
'timezone' => LotterySettings::drawTimezone(),
'interval_minutes' => LotterySettings::drawIntervalMinutes(),
@@ -47,9 +51,58 @@ final class AdminDrawIndexController extends Controller
]);
}
/** @return array<string, mixed> */
private function row(Draw $draw): array
/**
* @param list<int> $drawIds
* @return array<int, array{total_bet_minor: int, total_payout_minor: int, profit_loss_minor: int}>
*/
private function aggregateListStats(array $drawIds): array
{
if ($drawIds === []) {
return [];
}
$betByDraw = TicketOrder::query()
->whereIn('draw_id', $drawIds)
->groupBy('draw_id')
->selectRaw('draw_id, COALESCE(SUM(total_actual_deduct), 0) AS total_bet')
->pluck('total_bet', 'draw_id');
$payoutRows = TicketItem::query()
->whereIn('draw_id', $drawIds)
->groupBy('draw_id')
->selectRaw(
'draw_id, COALESCE(SUM(win_amount), 0) AS win, COALESCE(SUM(jackpot_win_amount), 0) AS jackpot',
)
->get()
->keyBy('draw_id');
$stats = [];
foreach ($drawIds as $drawId) {
$bet = (int) ($betByDraw[$drawId] ?? $betByDraw[(string) $drawId] ?? 0);
$payoutRow = $payoutRows->get($drawId) ?? $payoutRows->get((string) $drawId);
$payout = (int) ($payoutRow->win ?? 0) + (int) ($payoutRow->jackpot ?? 0);
$stats[$drawId] = [
'total_bet_minor' => $bet,
'total_payout_minor' => $payout,
'profit_loss_minor' => $bet - $payout,
];
}
return $stats;
}
/**
* @param array<int, array{total_bet_minor: int, total_payout_minor: int, profit_loss_minor: int}> $statsByDrawId
* @return array<string, mixed>
*/
private function row(Draw $draw, array $statsByDrawId): array
{
$stats = $statsByDrawId[(int) $draw->id] ?? [
'total_bet_minor' => 0,
'total_payout_minor' => 0,
'profit_loss_minor' => 0,
];
return [
'id' => (int) $draw->id,
'draw_no' => $draw->draw_no,
@@ -66,14 +119,9 @@ final class AdminDrawIndexController extends Controller
'current_result_version' => (int) $draw->current_result_version,
'settle_version' => (int) $draw->settle_version,
'is_reopened' => (bool) $draw->is_reopened,
'total_bet_minor' => (int) TicketOrder::query()->where('draw_id', $draw->id)->sum('total_actual_deduct'),
'total_payout_minor' => (int) TicketItem::query()->where('draw_id', $draw->id)->sum('win_amount')
+ (int) TicketItem::query()->where('draw_id', $draw->id)->sum('jackpot_win_amount'),
'profit_loss_minor' => (int) TicketOrder::query()->where('draw_id', $draw->id)->sum('total_actual_deduct')
- (
(int) TicketItem::query()->where('draw_id', $draw->id)->sum('win_amount')
+ (int) TicketItem::query()->where('draw_id', $draw->id)->sum('jackpot_win_amount')
),
'total_bet_minor' => $stats['total_bet_minor'],
'total_payout_minor' => $stats['total_payout_minor'],
'profit_loss_minor' => $stats['profit_loss_minor'],
'updated_at' => $draw->updated_at?->toIso8601String(),
];
}