feat: 添加结算功能，更新 TicketItem 模型以支持最新结算详情，增强 DrawTickService 以自动处理结算，更新 TicketWalletService 以支持派彩入账，扩展 API 路由以管理结算批次和奖池
This commit is contained in:
@@ -0,0 +1,101 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\V1\Ticket;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Draw;
|
||||
use App\Models\Player;
|
||||
use App\Models\TicketCombination;
|
||||
use App\Models\TicketItem;
|
||||
use App\Services\Draw\DrawResultViewService;
|
||||
use App\Support\ApiResponse;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
/**
|
||||
* `GET /api/v1/ticket/draws/{draw_no}/my-match` — 当期本人号码与已发布开奖 23 格的交集（用于开奖页高亮）。
|
||||
*/
|
||||
class TicketDrawMyMatchController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly DrawResultViewService $drawResultView,
|
||||
) {}
|
||||
|
||||
public function __invoke(Request $request, string $draw_no): JsonResponse
|
||||
{
|
||||
/** @var Player $player */
|
||||
$player = $request->attributes->get('lottery_player');
|
||||
$draw_no = trim($draw_no);
|
||||
|
||||
$draw = Draw::query()->where('draw_no', $draw_no)->first();
|
||||
if ($draw === null || ! in_array($draw->status, DrawResultViewService::publishedDrawStatuses(), true)) {
|
||||
return ApiResponse::success([
|
||||
'draw_no' => $draw_no,
|
||||
'hit_numbers_4d' => [],
|
||||
'total_win_minor' => 0,
|
||||
'total_jackpot_win_minor' => 0,
|
||||
'has_bets' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
$payload = $this->drawResultView->summarizeDraw($draw);
|
||||
if ($payload === null) {
|
||||
return ApiResponse::success([
|
||||
'draw_no' => $draw_no,
|
||||
'hit_numbers_4d' => [],
|
||||
'total_win_minor' => 0,
|
||||
'total_jackpot_win_minor' => 0,
|
||||
'has_bets' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
$board = collect($payload['result_items'] ?? [])
|
||||
->pluck('number_4d')
|
||||
->filter()
|
||||
->map(fn ($n) => self::norm4d((string) $n))
|
||||
->unique()
|
||||
->flip();
|
||||
|
||||
$itemIds = TicketItem::query()
|
||||
->where('draw_id', $draw->id)
|
||||
->where('player_id', $player->id)
|
||||
->whereIn('status', ['success', 'settled_win', 'settled_lose'])
|
||||
->pluck('id');
|
||||
|
||||
$hasBets = $itemIds->isNotEmpty();
|
||||
|
||||
$hits = [];
|
||||
if ($hasBets) {
|
||||
$hits = TicketCombination::query()
|
||||
->whereIn('ticket_item_id', $itemIds)
|
||||
->pluck('number_4d')
|
||||
->map(fn ($n) => self::norm4d((string) $n))
|
||||
->filter(fn (string $n) => isset($board[$n]))
|
||||
->unique()
|
||||
->values()
|
||||
->all();
|
||||
}
|
||||
|
||||
$sums = TicketItem::query()
|
||||
->where('draw_id', $draw->id)
|
||||
->where('player_id', $player->id)
|
||||
->whereIn('status', ['settled_win', 'settled_lose'])
|
||||
->selectRaw('coalesce(sum(win_amount),0) as sum_win, coalesce(sum(jackpot_win_amount),0) as sum_jackpot')
|
||||
->first();
|
||||
|
||||
return ApiResponse::success([
|
||||
'draw_no' => $draw_no,
|
||||
'hit_numbers_4d' => $hits,
|
||||
'total_win_minor' => (int) ($sums->sum_win ?? 0),
|
||||
'total_jackpot_win_minor' => (int) ($sums->sum_jackpot ?? 0),
|
||||
'has_bets' => $hasBets,
|
||||
]);
|
||||
}
|
||||
|
||||
private static function norm4d(string $n): string
|
||||
{
|
||||
$n = preg_replace('/\D/', '', $n) ?? '';
|
||||
|
||||
return str_pad(substr($n, -4), 4, '0', STR_PAD_LEFT);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\V1\Ticket;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Lottery\ErrorCode;
|
||||
use App\Models\Player;
|
||||
use App\Models\TicketItem;
|
||||
use App\Services\Draw\DrawResultViewService;
|
||||
use App\Support\ApiResponse;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
/**
|
||||
* `GET /api/v1/ticket/items/{ticket_no}` — 注单详情（单注项 + 组合 + 结算摘要）。
|
||||
*/
|
||||
class TicketItemShowController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly DrawResultViewService $drawResultView,
|
||||
) {}
|
||||
|
||||
public function __invoke(Request $request, string $ticket_no): JsonResponse
|
||||
{
|
||||
/** @var Player $player */
|
||||
$player = $request->attributes->get('lottery_player');
|
||||
$ticket_no = trim($ticket_no);
|
||||
|
||||
$item = TicketItem::query()
|
||||
->where('ticket_no', $ticket_no)
|
||||
->where('player_id', $player->id)
|
||||
->with([
|
||||
'combinations',
|
||||
'draw',
|
||||
'order',
|
||||
'latestSettlementDetail',
|
||||
])
|
||||
->first();
|
||||
|
||||
if ($item === null) {
|
||||
return ApiResponse::error(
|
||||
trans('api.not_found', [], $request->lotteryLocale()),
|
||||
ErrorCode::NotFound->value,
|
||||
null,
|
||||
404,
|
||||
);
|
||||
}
|
||||
|
||||
$draw = $item->draw;
|
||||
$published = $draw !== null && in_array($draw->status, DrawResultViewService::publishedDrawStatuses(), true);
|
||||
$drawPayload = $published && $draw !== null ? $this->drawResultView->summarizeDraw($draw) : null;
|
||||
|
||||
$detail = $item->latestSettlementDetail;
|
||||
|
||||
return ApiResponse::success([
|
||||
'ticket_no' => $item->ticket_no,
|
||||
'order_no' => $item->order?->order_no,
|
||||
'draw_no' => $draw?->draw_no,
|
||||
'currency_code' => $item->order?->currency_code,
|
||||
'play_code' => $item->play_code,
|
||||
'dimension' => $item->dimension,
|
||||
'digit_slot' => $item->digit_slot,
|
||||
'original_number' => $item->original_number,
|
||||
'normalized_number' => $item->normalized_number,
|
||||
'unit_bet_amount' => (int) $item->unit_bet_amount,
|
||||
'total_bet_amount' => (int) $item->total_bet_amount,
|
||||
'rebate_rate_snapshot' => (string) $item->rebate_rate_snapshot,
|
||||
'actual_deduct_amount' => (int) $item->actual_deduct_amount,
|
||||
'status' => $item->status,
|
||||
'win_amount' => (int) $item->win_amount,
|
||||
'jackpot_win_amount' => (int) $item->jackpot_win_amount,
|
||||
'settled_at' => $item->settled_at?->toIso8601String(),
|
||||
'placed_at' => $item->order?->created_at?->toIso8601String(),
|
||||
'odds_snapshot_json' => $item->odds_snapshot_json,
|
||||
'combinations' => $item->combinations->map(fn ($c) => [
|
||||
'combination_no' => (int) $c->combination_no,
|
||||
'number_4d' => (string) $c->number_4d,
|
||||
'bet_amount' => (int) $c->bet_amount,
|
||||
'estimated_payout' => (int) $c->estimated_payout,
|
||||
])->values()->all(),
|
||||
'settlement' => $detail === null ? null : [
|
||||
'matched_prize_tier' => $detail->matched_prize_tier,
|
||||
'win_amount_minor' => (int) $detail->win_amount,
|
||||
'jackpot_allocation_minor' => (int) $detail->jackpot_allocation_amount,
|
||||
],
|
||||
'published_draw_results' => $drawPayload,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\V1\Ticket;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Player;
|
||||
use App\Models\TicketItem;
|
||||
use App\Support\ApiResponse;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
/**
|
||||
* `GET /api/v1/ticket/items` — 我的注单（注项列表，支持 `draw_no` 筛选）。
|
||||
*/
|
||||
class TicketItemsIndexController extends Controller
|
||||
{
|
||||
public function __invoke(Request $request): JsonResponse
|
||||
{
|
||||
/** @var Player $player */
|
||||
$player = $request->attributes->get('lottery_player');
|
||||
|
||||
$perPage = max(1, min(50, (int) $request->query('per_page', 20)));
|
||||
$page = max(1, (int) $request->query('page', 1));
|
||||
$drawNo = $request->query('draw_no');
|
||||
|
||||
$query = TicketItem::query()
|
||||
->where('ticket_items.player_id', $player->id)
|
||||
->with([
|
||||
'draw:id,draw_no,business_date',
|
||||
'order:id,order_no,currency_code,created_at',
|
||||
])
|
||||
->orderByDesc('ticket_items.id');
|
||||
|
||||
if (is_string($drawNo) && $drawNo !== '') {
|
||||
$drawNo = trim($drawNo);
|
||||
$query->whereHas('draw', fn ($q) => $q->where('draw_no', $drawNo));
|
||||
}
|
||||
|
||||
$paginator = $query->paginate(perPage: $perPage, page: $page);
|
||||
|
||||
$items = collect($paginator->items())->map(function (TicketItem $row): array {
|
||||
return [
|
||||
'ticket_no' => $row->ticket_no,
|
||||
'order_no' => $row->order?->order_no,
|
||||
'draw_no' => $row->draw?->draw_no,
|
||||
'currency_code' => $row->order?->currency_code,
|
||||
'play_code' => $row->play_code,
|
||||
'original_number' => $row->original_number,
|
||||
'total_bet_amount' => (int) $row->total_bet_amount,
|
||||
'actual_deduct_amount' => (int) $row->actual_deduct_amount,
|
||||
'status' => $row->status,
|
||||
'win_amount' => (int) $row->win_amount,
|
||||
'jackpot_win_amount' => (int) $row->jackpot_win_amount,
|
||||
'placed_at' => $row->order?->created_at?->toIso8601String(),
|
||||
'updated_at' => $row->updated_at?->toIso8601String(),
|
||||
];
|
||||
})->values()->all();
|
||||
|
||||
return ApiResponse::success([
|
||||
'items' => $items,
|
||||
'total' => $paginator->total(),
|
||||
'page' => $paginator->currentPage(),
|
||||
'per_page' => $paginator->perPage(),
|
||||
'last_page' => $paginator->lastPage(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user