fix: 统一注单待开奖状态并收敛报表任务返回字段
This commit is contained in:
@@ -31,10 +31,7 @@ final class ReportJobIndexController extends Controller
|
||||
'admin_user_id' => $j->admin_user_id !== null ? (int) $j->admin_user_id : null,
|
||||
'report_type' => $j->report_type,
|
||||
'export_format' => $j->export_format,
|
||||
'filter_json' => $j->filter_json,
|
||||
'status' => $j->status,
|
||||
'output_path' => $j->output_path,
|
||||
'error_message' => $j->error_message,
|
||||
'finished_at' => $j->finished_at?->toIso8601String(),
|
||||
'created_at' => $j->created_at?->toIso8601String(),
|
||||
];
|
||||
|
||||
@@ -18,10 +18,7 @@ final class ReportJobShowController extends Controller
|
||||
'admin_user_id' => $report_job->admin_user_id !== null ? (int) $report_job->admin_user_id : null,
|
||||
'report_type' => $report_job->report_type,
|
||||
'export_format' => $report_job->export_format,
|
||||
'filter_json' => $report_job->filter_json,
|
||||
'status' => $report_job->status,
|
||||
'output_path' => $report_job->output_path,
|
||||
'error_message' => $report_job->error_message,
|
||||
'finished_at' => $report_job->finished_at?->toIso8601String(),
|
||||
'created_at' => $report_job->created_at?->toIso8601String(),
|
||||
]);
|
||||
|
||||
@@ -33,7 +33,6 @@ final class ReportJobStoreController extends Controller
|
||||
'report_type' => $job->report_type,
|
||||
'export_format' => $job->export_format,
|
||||
'status' => $job->status,
|
||||
'output_path' => $job->output_path,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ final class TicketDrawMyMatchController extends Controller
|
||||
$itemIds = TicketItem::query()
|
||||
->where('draw_id', $draw->id)
|
||||
->where('player_id', $player->id)
|
||||
->whereIn('status', ['success', 'settled_win', 'settled_lose'])
|
||||
->whereIn('status', ['pending_draw', 'settled_win', 'settled_lose'])
|
||||
->pluck('id');
|
||||
|
||||
$hasBets = $itemIds->isNotEmpty();
|
||||
|
||||
Reference in New Issue
Block a user