admin: 增加批次详情页(BAS/BMPA)支持run_id复盘

app/Http/Controllers/Admin/PlatformBatchController.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Concerns\ResolvesPlatformAdminContext;
+use App\Http\Controllers\Controller;
+use App\Models\PlatformOrder;
+use App\Support\BackUrl;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class PlatformBatchController extends Controller
+{
+    use ResolvesPlatformAdminContext;
+
+    public function show(Request $request): View
+    {
+        $this->ensurePlatformAdmin($request);
+
+        $type = trim((string) $request->query('type', ''));
+        $runId = trim((string) $request->query('run_id', ''));
+
+        $type = $type === 'bmpa' ? 'bmpa' : ($type === 'bas' ? 'bas' : '');
+
+        $incomingBack = (string) $request->query('back', '');
+        $safeBackForLinks = BackUrl::sanitizeForLinks($incomingBack);
+
+        if ($type === '' || $runId === '') {
+            return view('admin.platform_batches.show', [
+                'type' => $type,
+                'runId' => $runId,
+                'safeBackForLinks' => $safeBackForLinks,
+                'error' => '参数不完整：请提供 type（bas/bmpa）与 run_id。',
+                'summary' => null,
+                'governanceLinks' => [],
+            ]);
+        }
+
+        // 基于订单 meta 的扁平字段回捞 last_result（冗余写入策略下可行）
+        // 注意：为避免全表扫描，这里先按 run_id 过滤再取最近一条。
+        $keyPrefix = $type === 'bas' ? '$.batch_activation' : '$.batch_mark_paid_and_activate';
+
+        $query = PlatformOrder::query();
+        $driver = $query->getQuery()->getConnection()->getDriverName();
+
+        if ($driver === 'sqlite') {
+            $query->whereRaw("JSON_EXTRACT(meta, '{$keyPrefix}.run_id') = ?", [$runId]);
+        } else {
+            $query->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(meta, '{$keyPrefix}.run_id')) = ?", [$runId]);
+        }
+
+        $order = $query->orderByDesc('id')->first(['id', 'meta']);
+
+        $summary = null;
+        if ($order) {
+            $summary = data_get($order->meta, $type === 'bas'
+                ? 'batch_activation.last_result'
+                : 'batch_mark_paid_and_activate.last_result');
+        }
+
+        // 治理入口：全部/失败/按Top原因/可重试
+        $governanceLinks = [];
+
+        if ($type === 'bas') {
+            $governanceLinks['all'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
+                'batch_activation_run_id' => $runId,
+            ]), $safeBackForLinks);
+
+            $governanceLinks['failed'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
+                'batch_activation_run_id' => $runId,
+                'sync_status' => 'failed',
+            ]), $safeBackForLinks);
+
+            $governanceLinks['retry_syncable'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
+                'batch_activation_run_id' => $runId,
+                'sync_status' => 'unsynced',
+                'syncable_only' => '1',
+            ]), $safeBackForLinks);
+
+            $topReason = (string) (data_get($summary, 'top_reasons.0.reason') ?? '');
+            if ($topReason !== '') {
+                $governanceLinks['top_reason'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
+                    'batch_activation_run_id' => $runId,
+                    'sync_status' => 'failed',
+                    'sync_error_keyword' => $topReason,
+                ]), $safeBackForLinks);
+            }
+        }
+
+        if ($type === 'bmpa') {
+            $governanceLinks['all'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
+                'batch_bmpa_run_id' => $runId,
+            ]), $safeBackForLinks);
+
+            $governanceLinks['failed'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
+                'batch_bmpa_run_id' => $runId,
+                'bmpa_failed_only' => '1',
+            ]), $safeBackForLinks);
+
+            $governanceLinks['retry_processable'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
+                'batch_bmpa_run_id' => $runId,
+                'status' => 'pending',
+                'payment_status' => 'unpaid',
+            ]), $safeBackForLinks);
+
+            $topReason = (string) (data_get($summary, 'top_reasons.0.reason') ?? '');
+            if ($topReason !== '') {
+                $governanceLinks['top_reason'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
+                    'batch_bmpa_run_id' => $runId,
+                    'bmpa_failed_only' => '1',
+                    'bmpa_error_keyword' => $topReason,
+                ]), $safeBackForLinks);
+            }
+        }
+
+        return view('admin.platform_batches.show', [
+            'type' => $type,
+            'runId' => $runId,
+            'safeBackForLinks' => $safeBackForLinks,
+            'error' => '',
+            'summary' => $summary,
+            'governanceLinks' => $governanceLinks,
+        ]);
+    }
+}

resources/views/admin/platform_batches/show.blade.php

@@ -0,0 +1,105 @@
+@extends('admin.layouts.app')
+
+@section('title', '批次详情')
+@section('page_title', '批次详情')
+
+@section('content')
+@php
+    $typeText = $type === 'bas' ? 'BAS（批量同步订阅）' : ($type === 'bmpa' ? 'BMPA（批量标记支付并生效）' : '未知');
+
+    $selfWithoutBack = \App\Support\BackUrl::selfWithoutBack();
+    $backToListUrl = $safeBackForLinks !== '' ? $safeBackForLinks : '/admin/platform-orders';
+
+    $success = (int) (data_get($summary, 'success') ?? 0);
+    $failed = (int) (data_get($summary, 'failed') ?? 0);
+    $matched = (int) (data_get($summary, 'matched') ?? 0);
+    $processed = (int) (data_get($summary, 'processed') ?? 0);
+    $at = (string) (data_get($summary, 'at') ?? '');
+    $topReasons = (array) (data_get($summary, 'top_reasons', []) ?? []);
+@endphp
+
+<div class="card mb-20">
+    <div class="actions-spread">
+        <div>
+            <h2 class="mb-6">{{ $typeText }} 批次详情</h2>
+            <div class="muted">run_id：<strong>{{ $runId ?: '-' }}</strong></div>
+            @if($at !== '')
+                <div class="muted muted-xs">更新时间：{{ $at }}</div>
+            @endif
+        </div>
+        <div class="actions gap-10">
+            <a class="btn btn-secondary btn-sm" href="{{ $backToListUrl }}">返回上一页</a>
+            <a class="btn btn-secondary btn-sm" href="/admin/platform-batches/show?type={{ $type }}&run_id={{ urlencode($runId) }}&back={{ urlencode($selfWithoutBack) }}">刷新</a>
+        </div>
+    </div>
+</div>
+
+@if(($error ?? '') !== '')
+    <div class="warning">{{ $error }}</div>
+@else
+    <div class="grid-3 mb-20">
+        <div class="card">
+            <h3>命中</h3>
+            <div class="metric-number">{{ $matched }}</div>
+        </div>
+        <div class="card">
+            <h3>本次处理</h3>
+            <div class="metric-number">{{ $processed }}</div>
+        </div>
+        <div class="card">
+            <h3>成功 / 失败</h3>
+            <div class="metric-number">{{ $success }} / {{ $failed }}</div>
+        </div>
+    </div>
+
+    <div class="card mb-20">
+        <h3>一键治理入口</h3>
+        <div class="inline-links">
+            @if(($governanceLinks['all'] ?? '') !== '')
+                <a class="link" href="{{ $governanceLinks['all'] }}">本批次全部</a>
+            @endif
+            @if(($governanceLinks['failed'] ?? '') !== '')
+                <span class="muted">｜</span>
+                <a class="link" href="{{ $governanceLinks['failed'] }}">本批次失败</a>
+            @endif
+            @if(($governanceLinks['top_reason'] ?? '') !== '')
+                <span class="muted">｜</span>
+                <a class="link" href="{{ $governanceLinks['top_reason'] }}">按Top原因</a>
+            @endif
+            @if(($governanceLinks['retry_syncable'] ?? '') !== '')
+                <span class="muted">｜</span>
+                <a class="link" href="{{ $governanceLinks['retry_syncable'] }}">本批次可同步重试</a>
+            @endif
+            @if(($governanceLinks['retry_processable'] ?? '') !== '')
+                <span class="muted">｜</span>
+                <a class="link" href="{{ $governanceLinks['retry_processable'] }}">本批次可再次尝试（pending+unpaid）</a>
+            @endif
+        </div>
+        <div class="muted muted-xs mt-6">说明：当前批次为“冗余写入到每条订单 meta.last_result”的模式；后续可演进为独立批次表。</div>
+    </div>
+
+    <div class="card">
+        <h3>Top 失败原因</h3>
+        @if(count($topReasons) === 0)
+            <div class="muted">暂无（或尚未写入 last_result）。</div>
+        @else
+            <table class="table">
+                <thead>
+                <tr>
+                    <th>原因</th>
+                    <th style="width: 120px;">次数</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($topReasons as $r)
+                    <tr>
+                        <td>{{ (string) (data_get($r, 'reason') ?? '-') }}</td>
+                        <td>{{ (int) (data_get($r, 'count') ?? 0) }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        @endif
+    </div>
+@endif
+@endsection

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

@@ -1545,7 +1545,7 @@
                         <div class="muted muted-xs">范围：{{ $batchScopeText }}；方式：{{ $batchModeText }}</div>
                         @if($lrRunId !== '')
                             <div class="muted muted-xs">批次：
-                                <a class="link" href="{!! $safeFullUrlWithQuery(['batch_activation_run_id' => $lrRunId, 'page' => null]) !!}">{{ $lrRunId }}</a>
+                                <a class="link" href="/admin/platform-batches/show?type=bas&run_id={{ urlencode($lrRunId) }}&back={{ urlencode($selfWithoutBack) }}">{{ $lrRunId }}</a>
                             </div>
                             <div class="muted muted-xs">结果：成功{{ $lrSuccess }} / 失败{{ $lrFailed }}</div>
                             @php
@@ -1610,7 +1610,7 @@
 
                         @if($bmpaRunId !== '')
                             <div class="muted muted-xs">批次：
-                                <a class="link" href="{!! $safeFullUrlWithQuery(['batch_bmpa_run_id' => $bmpaRunId, 'page' => null]) !!}">{{ $bmpaRunId }}</a>
+                                <a class="link" href="/admin/platform-batches/show?type=bmpa&run_id={{ urlencode($bmpaRunId) }}&back={{ urlencode($selfWithoutBack) }}">{{ $bmpaRunId }}</a>
                             </div>
                         @endif
 

routes/web.php

@@ -113,6 +113,9 @@ Route::prefix('admin')->group(function () {
         Route::get('/platform-orders', [PlatformOrderController::class, 'index']);
         Route::get('/platform-orders/export', [PlatformOrderController::class, 'export']);
         Route::get('/platform-orders/create', [PlatformOrderController::class, 'create']);
+
+        // 批次详情（可复盘）：BAS/BMPA run_id → last_result + 一键治理入口
+        Route::get('/platform-batches/show', [\App\Http\Controllers\Admin\PlatformBatchController::class, 'show']);
         Route::post('/platform-orders', [PlatformOrderController::class, 'store']);
         Route::post('/platform-orders/batch-activate-subscriptions', [PlatformOrderController::class, 'batchActivateSubscriptions']);
         Route::post('/platform-orders/batch-mark-paid-and-activate', [PlatformOrderController::class, 'batchMarkPaidAndActivate']);

tests/Feature/AdminPlatformBatchShowPageShouldRenderBasSummaryAndGovernanceLinksTest.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Merchant;
+use App\Models\Plan;
+use App\Models\PlatformOrder;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdminPlatformBatchShowPageShouldRenderBasSummaryAndGovernanceLinksTest 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_show_page_should_render_bas_last_result_and_governance_links(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $merchant = Merchant::query()->firstOrFail();
+        $plan = Plan::query()->create([
+            'code' => 'plan_batch_show_bas_0001',
+            'name' => '批次页 BAS 渲染测试套餐',
+            'billing_cycle' => 'monthly',
+            'price' => 10,
+            'list_price' => 10,
+            'status' => 'active',
+            'sort' => 10,
+            'published_at' => now(),
+        ]);
+
+        $runId = 'BAS_SHOW_0001';
+
+        PlatformOrder::query()->create([
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'order_no' => 'PO_BATCH_SHOW_BAS_0001',
+            'order_type' => 'new_purchase',
+            'status' => 'activated',
+            'payment_status' => 'paid',
+            'plan_name' => $plan->name,
+            'billing_cycle' => $plan->billing_cycle,
+            'period_months' => 1,
+            'quantity' => 1,
+            'payable_amount' => 10,
+            'paid_amount' => 10,
+            'placed_at' => now()->subMinutes(10),
+            'paid_at' => now()->subMinutes(9),
+            'activated_at' => now()->subMinutes(8),
+            'meta' => [
+                'batch_activation' => [
+                    'at' => now()->toDateTimeString(),
+                    'admin_id' => 1,
+                    'scope' => 'filtered',
+                    'mode' => 'queue',
+                    'run_id' => $runId,
+                    'last_result' => [
+                        'run_id' => $runId,
+                        'success' => 3,
+                        'failed' => 1,
+                        'matched' => 10,
+                        'processed' => 4,
+                        'top_reasons' => [
+                            ['reason' => '模拟失败：订阅同步异常', 'count' => 1],
+                        ],
+                        'at' => now()->toDateTimeString(),
+                    ],
+                ],
+            ],
+        ]);
+
+        $html = $this->get('/admin/platform-batches/show?type=bas&run_id=' . $runId)
+            ->assertOk()
+            ->getContent();
+
+        $this->assertStringContainsString('BAS（批量同步订阅） 批次详情', $html);
+        $this->assertStringContainsString('run_id：<strong>' . $runId . '</strong>', $html);
+
+        // 汇总数字
+        $this->assertStringContainsString('命中', $html);
+        $this->assertStringContainsString('10', $html);
+        $this->assertStringContainsString('本次处理', $html);
+        $this->assertStringContainsString('4', $html);
+        $this->assertStringContainsString('成功 / 失败', $html);
+        $this->assertStringContainsString('3 / 1', $html);
+
+        // 治理链接
+        $this->assertStringContainsString('batch_activation_run_id=' . $runId, $html);
+        $this->assertStringContainsString('sync_status=failed', $html);
+        $this->assertStringContainsString('syncable_only=1', $html);
+        $this->assertStringContainsString('sync_status=unsynced', $html);
+        $this->assertStringContainsString('sync_error_keyword=', $html);
+        $this->assertStringContainsString(urlencode('模拟失败：订阅同步异常'), $html);
+    }
+}

tests/Feature/AdminPlatformBatchShowPageShouldRenderBmpaSummaryAndGovernanceLinksTest.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Merchant;
+use App\Models\Plan;
+use App\Models\PlatformOrder;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdminPlatformBatchShowPageShouldRenderBmpaSummaryAndGovernanceLinksTest 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_show_page_should_render_bmpa_last_result_and_governance_links(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $merchant = Merchant::query()->firstOrFail();
+        $plan = Plan::query()->create([
+            'code' => 'plan_batch_show_bmpa_0001',
+            'name' => '批次页 BMPA 渲染测试套餐',
+            'billing_cycle' => 'monthly',
+            'price' => 10,
+            'list_price' => 10,
+            'status' => 'active',
+            'sort' => 10,
+            'published_at' => now(),
+        ]);
+
+        $runId = 'BMPA_SHOW_0001';
+
+        PlatformOrder::query()->create([
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'order_no' => 'PO_BATCH_SHOW_BMPA_0001',
+            'order_type' => 'new_purchase',
+            'status' => 'activated',
+            'payment_status' => 'paid',
+            'plan_name' => $plan->name,
+            'billing_cycle' => $plan->billing_cycle,
+            'period_months' => 1,
+            'quantity' => 1,
+            'payable_amount' => 10,
+            'paid_amount' => 10,
+            'placed_at' => now()->subMinutes(10),
+            'paid_at' => now()->subMinutes(9),
+            'activated_at' => now()->subMinutes(8),
+            'meta' => [
+                'batch_mark_paid_and_activate' => [
+                    'at' => now()->toDateTimeString(),
+                    'admin_id' => 1,
+                    'scope' => 'filtered',
+                    'mode' => 'queue',
+                    'run_id' => $runId,
+                    'last_result' => [
+                        'run_id' => $runId,
+                        'success' => 2,
+                        'failed' => 2,
+                        'matched' => 10,
+                        'processed' => 4,
+                        'top_reasons' => [
+                            ['reason' => '模拟失败：订单不是待处理+未支付', 'count' => 2],
+                        ],
+                        'at' => now()->toDateTimeString(),
+                    ],
+                ],
+            ],
+        ]);
+
+        $html = $this->get('/admin/platform-batches/show?type=bmpa&run_id=' . $runId)
+            ->assertOk()
+            ->getContent();
+
+        $this->assertStringContainsString('BMPA（批量标记支付并生效） 批次详情', $html);
+        $this->assertStringContainsString('run_id：<strong>' . $runId . '</strong>', $html);
+
+        // 汇总数字
+        $this->assertStringContainsString('成功 / 失败', $html);
+        $this->assertStringContainsString('2 / 2', $html);
+
+        // 治理链接
+        $this->assertStringContainsString('batch_bmpa_run_id=' . $runId, $html);
+        $this->assertStringContainsString('bmpa_failed_only=1', $html);
+        $this->assertStringContainsString('status=pending', $html);
+        $this->assertStringContainsString('payment_status=unpaid', $html);
+        $this->assertStringContainsString('bmpa_error_keyword=', $html);
+        $this->assertStringContainsString(urlencode('模拟失败：订单不是待处理+未支付'), $html);
+    }
+}

tests/Feature/AdminPlatformOrderIndexBatchRunIdShouldLinkToBatchShowPageTest.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Merchant;
+use App\Models\Plan;
+use App\Models\PlatformOrder;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdminPlatformOrderIndexBatchRunIdShouldLinkToBatchShowPageTest 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_platform_orders_page_should_link_batch_run_id_to_batch_show_page(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $merchant = Merchant::query()->firstOrFail();
+
+        $plan = Plan::query()->create([
+            'code' => 'plan_batch_run_id_link_0001',
+            'name' => '批次 run_id 链接测试套餐',
+            'billing_cycle' => 'monthly',
+            'price' => 10,
+            'list_price' => 10,
+            'status' => 'active',
+            'sort' => 10,
+            'published_at' => now(),
+        ]);
+
+        PlatformOrder::query()->create([
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'order_no' => 'PO_BATCH_LINK_0001',
+            'order_type' => 'new_purchase',
+            'status' => 'activated',
+            'payment_status' => 'paid',
+            'plan_name' => $plan->name,
+            'billing_cycle' => $plan->billing_cycle,
+            'period_months' => 1,
+            'quantity' => 1,
+            'payable_amount' => 10,
+            'paid_amount' => 10,
+            'placed_at' => now()->subMinutes(10),
+            'paid_at' => now()->subMinutes(9),
+            'activated_at' => now()->subMinutes(8),
+            'meta' => [
+                'batch_activation' => [
+                    'at' => now()->toDateTimeString(),
+                    'admin_id' => 1,
+                    'scope' => 'filtered',
+                    'mode' => 'queue',
+                    'run_id' => 'BAS_LINK_0001',
+                    'last_result' => [
+                        'run_id' => 'BAS_LINK_0001',
+                        'success' => 1,
+                        'failed' => 0,
+                        'matched' => 1,
+                        'processed' => 1,
+                        'top_reasons' => [],
+                        'at' => now()->toDateTimeString(),
+                    ],
+                ],
+                'batch_mark_paid_and_activate' => [
+                    'at' => now()->toDateTimeString(),
+                    'admin_id' => 1,
+                    'scope' => 'filtered',
+                    'mode' => 'queue',
+                    'run_id' => 'BMPA_LINK_0001',
+                ],
+            ],
+        ]);
+
+        $html = $this->get('/admin/platform-orders')
+            ->assertOk()
+            ->getContent();
+
+        $this->assertStringContainsString('/admin/platform-batches/show?type=bas', $html);
+        $this->assertStringContainsString('run_id=BAS_LINK_0001', $html);
+
+        $this->assertStringContainsString('/admin/platform-batches/show?type=bmpa', $html);
+        $this->assertStringContainsString('run_id=BMPA_LINK_0001', $html);
+    }
+}