From 0b2f0c7d74c4395f9f4a0eb4758616bb688f0352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= <dev@saasshop.local>
Date: Tue, 17 Mar 2026 06:27:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E9=98=85=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E5=8A=A8=E4=BD=9C=E9=80=8F=E4=BC=A0=20ends?=
 =?UTF-8?q?=5Fat=20=E5=8C=BA=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/SiteSubscriptionController.php      |  6 ++++
 .../admin/site_subscriptions/index.blade.php  | 15 +++++++-
 ...ckedHintShouldIncludeGoExpiredLinkTest.php | 36 +++++++++++++++++++
 ...edFormShouldKeepEndsAtRangeFiltersTest.php | 32 +++++++++++++++++
 4 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 tests/Feature/AdminSiteSubscriptionIndexBatchMarkExpiredBlockedHintShouldIncludeGoExpiredLinkTest.php
 create mode 100644 tests/Feature/AdminSiteSubscriptionIndexBatchMarkExpiredFormShouldKeepEndsAtRangeFiltersTest.php

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 @@
             <input type="hidden" name="merchant_id" value="{{ $filters['merchant_id'] ?? '' }}">
             <input type="hidden" name="plan_id" value="{{ $filters['plan_id'] ?? '' }}">
             <input type="hidden" name="expiry" value="{{ $filters['expiry'] ?? '' }}">
+            <input type="hidden" name="ends_from" value="{{ $filters['ends_from'] ?? '' }}">
+            <input type="hidden" name="ends_to" value="{{ $filters['ends_to'] ?? '' }}">
             <input type="hidden" name="keyword" value="{{ $filters['keyword'] ?? '' }}">
             <button class="btn btn-secondary btn-sm" type="submit">导出 CSV</button>
         </form>
@@ -411,6 +413,8 @@
             <input type="hidden" name="merchant_id" value="{{ $filters['merchant_id'] ?? '' }}">
             <input type="hidden" name="plan_id" value="{{ $filters['plan_id'] ?? '' }}">
             <input type="hidden" name="expiry" value="{{ $filters['expiry'] ?? '' }}">
+            <input type="hidden" name="ends_from" value="{{ $filters['ends_from'] ?? '' }}">
+            <input type="hidden" name="ends_to" value="{{ $filters['ends_to'] ?? '' }}">
             <input type="hidden" name="keyword" value="{{ $filters['keyword'] ?? '' }}">
 
             <label class="muted form-inline-row">
@@ -422,7 +426,16 @@
             <div>
                 <button class="btn btn-danger btn-sm" type="submit" @disabled(! $batchMarkExpiredEnabled) title="{{ $batchMarkExpiredReason }}">批量标记已过期（当前集合）</button>
                 @if(! $batchMarkExpiredEnabled)
-                    <div class="adm-tool-blocked-hint">提示：{{ $batchMarkExpiredReason }}</div>
+                    <div class="adm-tool-blocked-hint" data-role="batch-mark-expired-blocked-hint">
+                        <div>提示：{{ $batchMarkExpiredReason }}</div>
+                        @php
+                            // 提效：被阻断时给一键跳转到「已过期（expiry=expired）」集合，避免运营来回找入口。
+                            $goExpiredUrl = $buildQuickFilterUrl(['status' => null, 'expiry' => 'expired', 'page' => null]);
+                        @endphp
+                        <div class="mt-6 actions gap-10">
+                            <a class="btn btn-secondary btn-sm" href="{!! $goExpiredUrl !!}">切到已过期集合</a>
+                        </div>
+                    </div>
                 @endif
             </div>
         </form>
diff --git a/tests/Feature/AdminSiteSubscriptionIndexBatchMarkExpiredBlockedHintShouldIncludeGoExpiredLinkTest.php b/tests/Feature/AdminSiteSubscriptionIndexBatchMarkExpiredBlockedHintShouldIncludeGoExpiredLinkTest.php
new file mode 100644
index 0000000..4a97b4a
--- /dev/null
+++ b/tests/Feature/AdminSiteSubscriptionIndexBatchMarkExpiredBlockedHintShouldIncludeGoExpiredLinkTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdminSiteSubscriptionIndexBatchMarkExpiredBlockedHintShouldIncludeGoExpiredLinkTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected function loginAsPlatformAdmin(): void
+    {
+        $this->seed();
+
+        $this->post('/admin/login', [
+            'email' => 'platform.admin@demo.local',
+            'password' => 'Platform@123456',
+        ])->assertRedirect('/admin');
+    }
+
+    public function test_blocked_hint_should_include_link_to_expired_scope(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        // 不在 expiry=expired 集合时，按钮应禁用并出现 blocked hint + 一键跳转。
+        $res = $this->get('/admin/site-subscriptions');
+        $res->assertOk();
+
+        $html = (string) $res->getContent();
+
+        $this->assertStringContainsString('data-role="batch-mark-expired-blocked-hint"', $html);
+        $this->assertStringContainsString('切到已过期集合', $html);
+        $this->assertStringContainsString('expiry=expired', $html);
+    }
+}
diff --git a/tests/Feature/AdminSiteSubscriptionIndexBatchMarkExpiredFormShouldKeepEndsAtRangeFiltersTest.php b/tests/Feature/AdminSiteSubscriptionIndexBatchMarkExpiredFormShouldKeepEndsAtRangeFiltersTest.php
new file mode 100644
index 0000000..ebf23e4
--- /dev/null
+++ b/tests/Feature/AdminSiteSubscriptionIndexBatchMarkExpiredFormShouldKeepEndsAtRangeFiltersTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdminSiteSubscriptionIndexBatchMarkExpiredFormShouldKeepEndsAtRangeFiltersTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected function loginAsPlatformAdmin(): void
+    {
+        $this->seed();
+
+        $this->post('/admin/login', [
+            'email' => 'platform.admin@demo.local',
+            'password' => 'Platform@123456',
+        ])->assertRedirect('/admin');
+    }
+
+    public function test_batch_mark_expired_form_should_keep_ends_at_range_filters(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $res = $this->get('/admin/site-subscriptions?expiry=expired&ends_from=2026-03-01&ends_to=2026-03-31');
+        $res->assertOk();
+
+        $res->assertSee('name="ends_from" value="2026-03-01"', false);
+        $res->assertSee('name="ends_to" value="2026-03-31"', false);
+    }
+}