feat: 重构注单控制器以复用共享筛选逻辑

新增 TicketItemListFilters trait,用于封装注单列表的通用筛选逻辑。
更新 AdminPlayerTicketItemsIndexController、AdminTicketItemIndexController 与 TicketItemsIndexController,统一使用新的注单编号搜索与订单日期范围筛选方法,提升代码复用性与可读性。
增强 AdminRiskPoolManualStatusController:支持发布手动停售状态变更通知。
优化 RiskPoolService 与 TicketWalletService:钱包资金变动后实时通知余额更新。
更新测试用例,确保重构后功能行为保持一致。
This commit is contained in:
2026-05-26 17:14:19 +08:00
parent 36e50383ba
commit 618201f980
12 changed files with 408 additions and 84 deletions

View File

@@ -8,6 +8,7 @@ use App\Models\TicketItem;
use App\Support\ApiResponse;
use App\Support\CurrencyFormatter;
use App\Support\PaginationTrait;
use App\Support\TicketItemListFilters;
use Illuminate\Http\JsonResponse;
/**
@@ -25,6 +26,7 @@ use Illuminate\Http\JsonResponse;
final class AdminTicketItemIndexController extends Controller
{
use PaginationTrait;
use TicketItemListFilters;
public function __invoke(TicketItemListRequest $request): JsonResponse
{
@@ -72,24 +74,12 @@ final class AdminTicketItemIndexController extends Controller
}
$number = trim((string) ($validated['number'] ?? ''));
if ($number !== '') {
$query->where(function ($q) use ($number): void {
$q->where('ticket_items.original_number', 'like', '%'.$number.'%')
->orWhere('ticket_items.normalized_number', 'like', '%'.$number.'%')
->orWhere('ticket_items.ticket_no', 'like', '%'.$number.'%')
->orWhereHas('order', fn ($order) => $order->where('order_no', 'like', '%'.$number.'%'));
});
}
$startDate = $validated['start_date'] ?? null;
if (is_string($startDate) && $startDate !== '') {
$query->whereHas('order', fn ($q) => $q->whereDate('created_at', '>=', $startDate));
}
$endDate = $validated['end_date'] ?? null;
if (is_string($endDate) && $endDate !== '') {
$query->whereHas('order', fn ($q) => $q->whereDate('created_at', '<=', $endDate));
}
$this->applyTicketItemNumberSearch($query, $number);
$this->applyOrderPlacedDateRange(
$query,
is_string($validated['start_date'] ?? null) ? $validated['start_date'] : null,
is_string($validated['end_date'] ?? null) ? $validated['end_date'] : null,
);
$paginator = $query->paginate(perPage: $perPage, page: $page, columns: ['*']);