From 8cd258f2044138e64bec2323f28eb27d900b5c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= <dev@saasshop.local>
Date: Fri, 13 Mar 2026 21:55:02 +0000
Subject: [PATCH] feat: plan store/update respect back redirect

---
 app/Http/Controllers/Admin/PlanController.php | 16 ++++++++++++++++
 resources/views/admin/plans/form.blade.php    |  5 +++++
 tests/Feature/AdminPlanTest.php               | 10 ++++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/PlanController.php b/app/Http/Controllers/Admin/PlanController.php
index 5852e94..d7b27c3 100644
--- a/app/Http/Controllers/Admin/PlanController.php
+++ b/app/Http/Controllers/Admin/PlanController.php
@@ -160,8 +160,16 @@ class PlanController extends Controller
         $this->ensurePlatformAdmin($request);
 
         $data = $this->validatePlan($request);
+
+        $back = (string) $request->input('back', '');
+        $safeBack = str_starts_with($back, '/') ? $back : '';
+
         $plan = Plan::query()->create($data);
 
+        if ($safeBack !== '') {
+            return redirect($safeBack)->with('success', '套餐已创建：' . $plan->name);
+        }
+
         return redirect('/admin/plans')->with('success', '套餐已创建：' . $plan->name);
     }
 
@@ -207,8 +215,16 @@ class PlanController extends Controller
         $this->ensurePlatformAdmin($request);
 
         $data = $this->validatePlan($request, $plan->id);
+
+        $back = (string) $request->input('back', '');
+        $safeBack = str_starts_with($back, '/') ? $back : '';
+
         $plan->update($data);
 
+        if ($safeBack !== '') {
+            return redirect($safeBack)->with('success', '套餐已更新：' . $plan->name);
+        }
+
         return redirect('/admin/plans')->with('success', '套餐已更新：' . $plan->name);
     }
 
diff --git a/resources/views/admin/plans/form.blade.php b/resources/views/admin/plans/form.blade.php
index 8d9c411..d806fd5 100644
--- a/resources/views/admin/plans/form.blade.php
+++ b/resources/views/admin/plans/form.blade.php
@@ -12,6 +12,11 @@
 <form method="post" action="{{ $formAction }}" class="card form-grid">
     @csrf
 
+    @php $back = (string) ($back ?? ''); @endphp
+    @if($back !== '')
+        <input type="hidden" name="back" value="{{ $back }}">
+    @endif
+
     <label>
         <span>套餐名称</span>
         <input name="name" value="{{ old('name', $plan->name) }}" required>
diff --git a/tests/Feature/AdminPlanTest.php b/tests/Feature/AdminPlanTest.php
index c933fe7..6b99cd8 100644
--- a/tests/Feature/AdminPlanTest.php
+++ b/tests/Feature/AdminPlanTest.php
@@ -91,6 +91,8 @@ class AdminPlanTest extends TestCase
             ->assertSee('新建套餐')
             ->assertSee('套餐名称');
 
+        $back = '/admin/plans?status=active&billing_cycle=monthly';
+
         $this->post('/admin/plans', [
             'code' => 'pro_monthly_form',
             'name' => '专业版（月付）',
@@ -101,7 +103,8 @@ class AdminPlanTest extends TestCase
             'sort' => 5,
             'description' => '主要面向成长型站点',
             'published_at' => now()->format('Y-m-d H:i:s'),
-        ])->assertRedirect('/admin/plans');
+            'back' => $back,
+        ])->assertRedirect($back);
 
         $this->get('/admin/plans')
             ->assertSee('专业版（月付）')
@@ -126,6 +129,8 @@ class AdminPlanTest extends TestCase
             ->assertOk()
             ->assertSee('编辑套餐');
 
+        $back = '/admin/plans?published=unpublished';
+
         $this->post('/admin/plans/' . $plan->id, [
             'code' => 'update_test',
             'name' => '更新后套餐',
@@ -135,7 +140,8 @@ class AdminPlanTest extends TestCase
             'status' => 'active',
             'sort' => 10,
             'description' => '通过编辑表单更新',
-        ])->assertRedirect('/admin/plans');
+            'back' => $back,
+        ])->assertRedirect($back);
 
         $this->get('/admin/plans')
             ->assertSee('更新后套餐')