平台订单列表:锁定订阅ID时显示上下文提示

This commit is contained in:
萝卜
2026-03-13 23:33:44 +00:00
parent 36e7fa6c40
commit 8841238fb6
3 changed files with 84 additions and 0 deletions

View File

@@ -182,6 +182,13 @@ class PlatformOrderController extends Controller
->paginate(10) ->paginate(10)
->withQueryString(); ->withQueryString();
// 当前列表若锁定了订阅ID则加载该订阅用于“上下文提示/快捷续费下单”等运营入口
$currentSubscription = null;
$currentSubscriptionId = (int) ($filters['site_subscription_id'] ?? 0);
if ($currentSubscriptionId > 0) {
$currentSubscription = SiteSubscription::query()->with(['merchant', 'plan'])->find($currentSubscriptionId);
}
// 列表行级对账视图:回执总额 / 差额(便于运营快速定位问题订单) // 列表行级对账视图:回执总额 / 差额(便于运营快速定位问题订单)
$orders->getCollection()->transform(function (PlatformOrder $o) { $orders->getCollection()->transform(function (PlatformOrder $o) {
$receiptTotal = (float) $this->receiptTotalForOrder($o); $receiptTotal = (float) $this->receiptTotalForOrder($o);
@@ -258,6 +265,7 @@ class PlatformOrderController extends Controller
$totalPaidAmount = (float) ((clone $baseQuery)->sum('paid_amount') ?: 0); $totalPaidAmount = (float) ((clone $baseQuery)->sum('paid_amount') ?: 0);
return view('admin.platform_orders.index', [ return view('admin.platform_orders.index', [
'currentSubscription' => $currentSubscription,
'orders' => $orders, 'orders' => $orders,
'filters' => $filters, 'filters' => $filters,
'filterOptions' => [ 'filterOptions' => [

View File

@@ -30,6 +30,20 @@
<a href="{{ $safeBack }}" class="muted"> 返回上一页(保留上下文)</a> <a href="{{ $safeBack }}" class="muted"> 返回上一页(保留上下文)</a>
</div> </div>
@endif @endif
@php
$currentSubscription = $currentSubscription ?? null;
@endphp
@if($currentSubscription && $currentSubscription->id)
<div class="mt-10">
<div class="muted">当前已锁定订阅:</div>
<div>
<a class="link" href="/admin/site-subscriptions/{{ $currentSubscription->id }}">{{ $currentSubscription->subscription_no }}</a>
<span class="muted">订阅ID{{ $currentSubscription->id }}</span>
</div>
<div class="muted muted-xs">提示本页快捷筛选会保留该订阅ID右上角“新建平台订单”会自动预填订阅ID。</div>
</div>
@endif
</div> </div>
<div class="card mb-20"> <div class="card mb-20">

View File

@@ -0,0 +1,62 @@
<?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 AdminPlatformOrderIndexSubscriptionContextHintTest 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_index_should_render_current_subscription_context_hint_when_site_subscription_id_present(): void
{
$this->loginAsPlatformAdmin();
$merchant = Merchant::query()->firstOrFail();
$plan = Plan::query()->create([
'code' => 'po_index_sub_hint_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_CTX_HINT_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?site_subscription_id=' . $sub->id);
$res->assertOk();
$res->assertSee('当前已锁定订阅:', false);
$res->assertSee($sub->subscription_no, false);
$res->assertSee('/admin/site-subscriptions/' . $sub->id, false);
}
}