From 54f356f52d570494e48633193ba989850894af2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= <dev@saasshop.local>
Date: Sun, 15 Mar 2026 04:03:56 +0000
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=AE=A2=E5=8D=95=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E9=A1=B5=EF=BC=9Arequire=5Fsubscription=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=9B=9E=E5=A1=AB=E5=B9=B6=E9=80=8F=E4=BC=A0=20hidden?=
 =?UTF-8?q?=20input=EF=BC=88=E6=A0=A1=E9=AA=8C=E5=A4=B1=E8=B4=A5=E5=90=8E?=
 =?UTF-8?q?=E4=BB=8D=E4=BF=9D=E6=8C=81=E6=B2=BB=E7=90=86=E5=8F=A3=E5=BE=84?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/PlatformOrderController.php | 6 +++++-
 resources/views/admin/platform_orders/form.blade.php   | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php
index 0879b9b..3d5d677 100644
--- a/app/Http/Controllers/Admin/PlatformOrderController.php
+++ b/app/Http/Controllers/Admin/PlatformOrderController.php
@@ -31,7 +31,11 @@ class PlatformOrderController extends Controller
 
         // 支持从其它页面（例如订阅详情）带默认值跳转过来，提高运营效率
         $orderTypeFromQuery = $request->query('order_type');
-        $requireSubscription = (string) $request->query('require_subscription', '') === '1';
+        // require_subscription：用于“续费必须先选订阅”的治理链路。
+        // - 优先读 query（用于各种入口跳转）
+        // - 同时兼容 old input（用于提交校验失败后 redirect back，仍保持治理 UI 口径）
+        $requireSubscription = ((string) $request->query('require_subscription', '') === '1')
+            || ((string) $request->old('require_subscription', '') === '1');
 
         $defaults = [
             'merchant_id' => (int) $request->query('merchant_id', 0),
diff --git a/resources/views/admin/platform_orders/form.blade.php b/resources/views/admin/platform_orders/form.blade.php
index a15ee98..3a132cb 100644
--- a/resources/views/admin/platform_orders/form.blade.php
+++ b/resources/views/admin/platform_orders/form.blade.php
@@ -68,6 +68,10 @@
 
     <input type="hidden" name="site_subscription_id" value="{{ old('site_subscription_id', $defaults['site_subscription_id'] ?? '') }}">
 
+    @if(($requireSubscription ?? false) || ((string) old('require_subscription', '') === '1'))
+        <input type="hidden" name="require_subscription" value="1">
+    @endif
+
     <input type="hidden" name="lead_id" value="{{ old('lead_id', $defaults['lead_id'] ?? '') }}">
 
     @php