diff --git a/app/Http/Controllers/Admin/SiteSubscriptionController.php b/app/Http/Controllers/Admin/SiteSubscriptionController.php index 2d15a06..d1b929f 100644 --- a/app/Http/Controllers/Admin/SiteSubscriptionController.php +++ b/app/Http/Controllers/Admin/SiteSubscriptionController.php @@ -320,6 +320,9 @@ class SiteSubscriptionController extends Controller // - expired:已过期(ends_at < now) // - expiring_7d:7 天内到期(now <= ends_at < now+7d) 'expiry' => trim((string) $request->query('expiry', '')), + // 到期时间范围筛选(用于到期治理更精确定位 ends_at) + 'ends_from' => trim((string) $request->query('ends_from', '')), + 'ends_to' => trim((string) $request->query('ends_to', '')), ]; $query = $this->applyFilters( @@ -448,6 +451,9 @@ class SiteSubscriptionController extends Controller 'merchant_id' => trim((string) $request->input('merchant_id', '')), 'plan_id' => trim((string) $request->input('plan_id', '')), 'expiry' => trim((string) $request->input('expiry', '')), + // 到期时间范围筛选:批量动作必须与当前列表口径一致 + 'ends_from' => trim((string) $request->input('ends_from', '')), + 'ends_to' => trim((string) $request->input('ends_to', '')), ]; if ((string) ($filters['expiry'] ?? '') !== 'expired') { diff --git a/resources/views/admin/site_subscriptions/index.blade.php b/resources/views/admin/site_subscriptions/index.blade.php index 6f2ec4b..e46ebdd 100644 --- a/resources/views/admin/site_subscriptions/index.blade.php +++ b/resources/views/admin/site_subscriptions/index.blade.php @@ -383,6 +383,8 @@ + + @@ -411,6 +413,8 @@ + +