feat(admin): 绑定订阅后回跳提示增强(attached_subscription + 滚动)

This commit is contained in:
萝卜
2026-03-15 17:23:58 +08:00
parent 77fd8af295
commit 7dd508e84d
3 changed files with 108 additions and 1 deletions

View File

@@ -664,6 +664,11 @@ class PlatformOrderController extends Controller
]);
$safeBack = \App\Support\BackUrl::sanitizeForLinks((string) ($data['back'] ?? ''));
// 进一步稳妥:强制回跳到订单详情自身(避免外部页面传错 back导致运营迷路
$fallbackBack = '/admin/platform-orders/' . $order->id;
if ($safeBack === '') {
$safeBack = $fallbackBack;
}
if ((string) ($order->order_type ?? '') !== 'renewal') {
return ($safeBack !== '' ? redirect($safeBack) : redirect()->back())
@@ -710,7 +715,15 @@ class PlatformOrderController extends Controller
$order->save();
return ($safeBack !== '' ? redirect($safeBack) : redirect()->back())
// 绑定成功后追加一个轻量 query用于前端 JS 做滚动/高亮提示(渐进增强)
$redirectUrl = $safeBack;
if (str_contains($redirectUrl, '?')) {
$redirectUrl .= '&attached_subscription=1';
} else {
$redirectUrl .= '?attached_subscription=1';
}
return redirect($redirectUrl)
->with('success', '已绑定订阅:' . (string) ($sub->subscription_no ?? $sub->id));
}

View File

@@ -12,6 +12,16 @@
return (root || document).querySelector(sel);
}
// 续费缺订阅治理:绑定成功后自动滚动到顶部提示区(让运营立刻看到 success/warning/error
// 说明:由后端 redirect url 追加 attached_subscription=1 触发。
if (window.location && window.location.search && window.location.search.indexOf('attached_subscription=1') >= 0) {
try {
window.scrollTo({ top: 0, behavior: 'smooth' });
} catch (e) {
window.scrollTo(0, 0);
}
}
// 续费缺订阅治理订单详情页“绑定订阅ID”输入框小交互增强
// - 输入后按 Enter 直接提交
// - 自动聚焦,减少点击

View File

@@ -0,0 +1,84 @@
<?php
namespace Tests\Feature;
use App\Models\Merchant;
use App\Models\Plan;
use App\Models\PlatformOrder;
use App\Models\SiteSubscription;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class AdminPlatformOrderAttachSubscriptionRedirectShouldCarryAttachedSubscriptionFlagTest 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_attach_subscription_should_redirect_to_order_show_with_attached_subscription_flag(): void
{
$this->loginAsPlatformAdmin();
$merchant = Merchant::query()->firstOrFail();
$plan = Plan::query()->create([
'code' => 'po_attach_sub_redirect_flag_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_ATTACH_REDIRECT_0001',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'amount' => 10,
'starts_at' => now()->subDays(1),
'ends_at' => now()->addDays(10),
'snapshot' => [],
'meta' => [],
]);
$order = PlatformOrder::query()->create([
'merchant_id' => $merchant->id,
'plan_id' => $plan->id,
'order_no' => 'PO_ATTACH_REDIRECT_0001',
'order_type' => 'renewal',
'site_subscription_id' => null,
'status' => 'pending',
'payment_status' => 'unpaid',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'quantity' => 1,
'payable_amount' => 10,
'paid_amount' => 0,
'placed_at' => now()->subMinutes(10),
'meta' => [],
]);
$res = $this->post('/admin/platform-orders/' . $order->id . '/attach-subscription', [
'site_subscription_id' => $sub->id,
// 故意不给 back应回跳到订单详情自身并携带 attached_subscription=1
]);
$res->assertRedirect('/admin/platform-orders/' . $order->id . '?attached_subscription=1');
}
}