PlatformOrder create: force renewal type when subscription context present

app/Http/Controllers/Admin/PlatformOrderController.php

@@ -65,6 +65,11 @@ class PlatformOrderController extends Controller
             $defaults['order_type'] = 'new_purchase';
         }
 
+        // 续费下单场景：若带了 site_subscription_id，则当前阶段强制视为续费单（避免语义混乱）。
+        if ($siteSubscriptionId > 0) {
+            $defaults['order_type'] = 'renewal';
+        }
+
         // 续费下单场景：若带了 site_subscription_id，但未显式指定 merchant/plan，则从订阅上补齐默认值。
         // 目的：让“从订阅维度跳转到下单页”的链路更稳，不必每次手工二次选择。
         if ($siteSubscription) {

resources/views/admin/platform_orders/form.blade.php

@@ -131,10 +131,15 @@
                 $selectedOrderType = 'new_purchase';
             }
 
-            // 更强治理：若来源页声明 require_subscription=1，且当前未绑定订阅，则不展示 upgrade/downgrade 等类型，避免误用。
+            // 更强治理：
+            // - 若存在订阅上下文（锁定订阅）=> 当前阶段仅允许“续费”类型，避免出现“带订阅ID但非续费”导致语义混乱/误同步。
+            // - 若来源页声明 require_subscription=1 且未绑定订阅 => 仅允许新购（用于兜底展示/引导去选订阅）。
             $requireSub = (bool) ($requireSubscription ?? false);
             $allowedTypes = array_keys($orderTypeLabels ?? []);
-            if ($requireSub && ! $canRenew) {
+            if ($hasLockedSubscription) {
+                $allowedTypes = ['renewal'];
+                $selectedOrderType = 'renewal';
+            } elseif ($requireSub && ! $canRenew) {
                 $allowedTypes = ['new_purchase'];
             }
         @endphp

tests/Feature/AdminPlatformOrderCreateShouldOnlyAllowRenewalTypeWhenSubscriptionLockedTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Merchant;
+use App\Models\Plan;
+use App\Models\SiteSubscription;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdminPlatformOrderCreateShouldOnlyAllowRenewalTypeWhenSubscriptionLockedTest 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_should_only_render_renewal_type_when_subscription_locked(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $merchant = Merchant::query()->firstOrFail();
+        $plan = Plan::query()->create([
+            'code' => 'po_create_only_renewal_when_locked_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' => 'activated',
+            'source' => 'manual',
+            'subscription_no' => 'SUB_ONLY_RENEWAL_0001',
+            'plan_name' => $plan->name,
+            'billing_cycle' => $plan->billing_cycle,
+            'period_months' => 1,
+            'amount' => 10,
+            'starts_at' => now()->subDay(),
+            'ends_at' => now()->addMonth(),
+            'activated_at' => now()->subDay(),
+        ]);
+
+        // 即使传入 order_type=new_purchase，也应被强制收敛为 renewal
+        $res = $this->get('/admin/platform-orders/create?site_subscription_id=' . $sub->id . '&order_type=new_purchase');
+        $res->assertOk();
+
+        $res->assertSee('value="renewal" selected', false);
+        $res->assertDontSee('value="new_purchase"', false);
+        $res->assertDontSee('value="upgrade"', false);
+        $res->assertDontSee('value="downgrade"', false);
+    }
+}