diff --git a/app/Http/Controllers/Admin/PlatformBatchController.php b/app/Http/Controllers/Admin/PlatformBatchController.php index a3421b5..8e8d261 100644 --- a/app/Http/Controllers/Admin/PlatformBatchController.php +++ b/app/Http/Controllers/Admin/PlatformBatchController.php @@ -25,6 +25,9 @@ class PlatformBatchController extends Controller $incomingBack = (string) $request->query('back', ''); $safeBackForLinks = BackUrl::sanitizeForLinks($incomingBack); + // 抽样复核:换一单(用 id 游标避免随机导致测试不稳定) + $spotAfterId = (int) $request->query('spot_after_id', 0); + if ($type === '' || $runId === '') { return view('admin.platform_batches.show', [ 'type' => $type, @@ -190,6 +193,10 @@ class PlatformBatchController extends Controller $sampleQuery->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(meta, '{$keyPrefix}.run_id')) = ?", [$runId]); } + if ($spotAfterId > 0) { + $sampleQuery->where('id', '<', $spotAfterId); + } + if ($type === 'bas') { $sampleQuery->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation.subscription_id') IS NOT NULL") ->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') IS NULL"); diff --git a/resources/views/admin/platform_batches/show.blade.php b/resources/views/admin/platform_batches/show.blade.php index f222d8e..8c8ba1d 100644 --- a/resources/views/admin/platform_batches/show.blade.php +++ b/resources/views/admin/platform_batches/show.blade.php @@ -129,6 +129,17 @@ @endif (从本批次成功集合抽一单,用于 spot-check) + @if(($spotCheck['order_id'] ?? 0) > 0) + @php + $spotPickNextUrl = '/admin/platform-batches/show?' . \Illuminate\Support\Arr::query([ + 'type' => $type, + 'run_id' => $runId, + 'spot_after_id' => (int) ($spotCheck['order_id'] ?? 0), + ]); + $spotPickNextUrl = \App\Support\BackUrl::withBack($spotPickNextUrl, $safeBackForLinks); + @endphp + 换一单 + @endif @else
暂无可抽样订单(可能暂无成功单,或 last_result 尚未补齐)。
diff --git a/tests/Feature/AdminPlatformBatchShowPageSpotCheckNextLinkShouldRenderTest.php b/tests/Feature/AdminPlatformBatchShowPageSpotCheckNextLinkShouldRenderTest.php new file mode 100644 index 0000000..961106b --- /dev/null +++ b/tests/Feature/AdminPlatformBatchShowPageSpotCheckNextLinkShouldRenderTest.php @@ -0,0 +1,126 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_batch_show_page_should_render_spot_check_next_link_with_spot_after_id(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'plan_batch_spot_next_0001', + 'name' => '批次页抽样复核换一单入口渲染测试套餐', + 'billing_cycle' => 'monthly', + 'price' => 10, + 'list_price' => 10, + 'status' => 'active', + 'sort' => 10, + 'published_at' => now(), + ]); + + $runId = 'BMPA_SPOT_NEXT_0001'; + + // 两单都属于同一批次且为成功(run_id 存在且无 error) + $orderA = PlatformOrder::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'order_no' => 'PO_BMPA_SPOT_NEXT_A', + '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(11), + 'paid_at' => now()->subMinutes(10), + 'activated_at' => now()->subMinutes(9), + 'meta' => [ + 'batch_mark_paid_and_activate' => [ + 'run_id' => $runId, + 'last_result' => [ + 'run_id' => $runId, + 'success' => 2, + 'failed' => 0, + 'matched' => 2, + 'processed' => 2, + 'top_reasons' => [], + 'at' => now()->toDateTimeString(), + ], + ], + ], + ]); + + $orderB = PlatformOrder::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'order_no' => 'PO_BMPA_SPOT_NEXT_B', + '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(8), + 'paid_at' => now()->subMinutes(7), + 'activated_at' => now()->subMinutes(6), + 'meta' => [ + 'batch_mark_paid_and_activate' => [ + 'run_id' => $runId, + 'last_result' => [ + 'run_id' => $runId, + 'success' => 2, + 'failed' => 0, + 'matched' => 2, + 'processed' => 2, + 'top_reasons' => [], + 'at' => now()->toDateTimeString(), + ], + ], + ], + ]); + + // 默认 spot-check 会选最新一单(orderB);"换一单" 应带 spot_after_id=orderB->id + $html = $this->get('/admin/platform-batches/show?type=bmpa&run_id=' . $runId) + ->assertOk() + ->getContent(); + + $this->assertStringContainsString('data-role="batch-spot-check-next"', $html); + $this->assertStringContainsString('spot_after_id=' . $orderB->id, $html); + $this->assertStringContainsString('type=bmpa', $html); + $this->assertStringContainsString('run_id=' . $runId, $html); + + // 带 spot_after_id 后,应能切换到更早的一单(orderA) + $html2 = $this->get('/admin/platform-batches/show?type=bmpa&run_id=' . $runId . '&spot_after_id=' . $orderB->id) + ->assertOk() + ->getContent(); + + $this->assertStringContainsString('/admin/platform-orders/' . $orderA->id, $html2); + $this->assertStringNotContainsString('/admin/platform-orders/' . $orderB->id . '#payment-receipts', $html2); + } +}