From a2d0de3f406ed6a55895568fbdab5d0051028d9a 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 23:25:03 +0000
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=9A=E6=96=B0=E5=BB=BA=E8=AE=A2=E5=8D=95=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E4=BB=8E=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E9=A2=84?=
 =?UTF-8?q?=E5=A1=AB=20merchant/plan/subscription?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/platform_orders/index.blade.php     | 14 +++-
 ...rIndexCreateLinkPrefillFromFiltersTest.php | 80 +++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 tests/Feature/AdminPlatformOrderIndexCreateLinkPrefillFromFiltersTest.php

diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php
index ff04157..2dc1a27 100644
--- a/resources/views/admin/platform_orders/index.blade.php
+++ b/resources/views/admin/platform_orders/index.blade.php
@@ -724,7 +724,19 @@
         <h3>平台订单列表</h3>
         @php
             // 新建平台订单：默认携带 back 回到本页自身（剔除 back query，避免嵌套）
-            $createOrderUrl = '/admin/platform-orders/create?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]);
+            // 同时：若当前列表已筛选站点/套餐/订阅ID，则预填到创建页，提高运营下单效率
+            $createQuery = ['back' => $selfWithoutBack];
+            if (trim((string) ($filters['merchant_id'] ?? '')) !== '') {
+                $createQuery['merchant_id'] = (int) ($filters['merchant_id'] ?? 0);
+            }
+            if (trim((string) ($filters['plan_id'] ?? '')) !== '') {
+                $createQuery['plan_id'] = (int) ($filters['plan_id'] ?? 0);
+            }
+            if (trim((string) ($filters['site_subscription_id'] ?? '')) !== '') {
+                $createQuery['site_subscription_id'] = (int) ($filters['site_subscription_id'] ?? 0);
+            }
+
+            $createOrderUrl = '/admin/platform-orders/create?' . \Illuminate\Support\Arr::query($createQuery);
         @endphp
         <a href="{!! $createOrderUrl !!}" class="btn">新建平台订单</a>
     </div>
diff --git a/tests/Feature/AdminPlatformOrderIndexCreateLinkPrefillFromFiltersTest.php b/tests/Feature/AdminPlatformOrderIndexCreateLinkPrefillFromFiltersTest.php
new file mode 100644
index 0000000..10478b9
--- /dev/null
+++ b/tests/Feature/AdminPlatformOrderIndexCreateLinkPrefillFromFiltersTest.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Merchant;
+use App\Models\Plan;
+use App\Models\SiteSubscription;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Arr;
+use Tests\TestCase;
+
+class AdminPlatformOrderIndexCreateLinkPrefillFromFiltersTest 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_create_platform_order_link_should_prefill_from_index_filters(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $merchant = Merchant::query()->firstOrFail();
+
+        $plan = Plan::query()->create([
+            'code' => 'po_index_prefill_plan',
+            'name' => '平台订单列表预填测试套餐',
+            'billing_cycle' => 'monthly',
+            'price' => 10,
+            'list_price' => 10,
+            'status' => 'active',
+            'sort' => 10,
+            'published_at' => now(),
+        ]);
+
+        $sub = SiteSubscription::query()->create([
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'status' => 'active',
+            'source' => 'manual',
+            'subscription_no' => 'SS_PREFILL_0001',
+            'plan_name' => $plan->name,
+            'billing_cycle' => $plan->billing_cycle,
+            'period_months' => 1,
+            'amount' => 10,
+            'starts_at' => now(),
+            'ends_at' => now()->addMonth(),
+        ]);
+
+        $res = $this->get('/admin/platform-orders?' . Arr::query([
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'site_subscription_id' => $sub->id,
+        ]));
+        $res->assertOk();
+
+        $expectedBack = '/admin/platform-orders?' . Arr::query([
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'site_subscription_id' => $sub->id,
+        ]);
+
+        $expectedCreateUrl = '/admin/platform-orders/create?' . Arr::query([
+            'back' => $expectedBack,
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'site_subscription_id' => $sub->id,
+        ]);
+
+        $res->assertSee($expectedCreateUrl, false);
+        $res->assertDontSee('back%3D', false);
+    }
+}