diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 21d6ca6..09dfa0d 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -884,7 +884,15 @@ : '-'; $syncStatusText = $syncErrMsg !== '' ? '失败' : '正常'; - $bmpaStatusText = $bmpaErrMsg !== '' ? '失败' : '正常'; + + // BMPA 摘要口径(更贴近治理/复核): + // - 有 error.message:失败 + // - 无 error 且有 run_id:成功(可用于抽样复核 spot-check) + // - 否则:无(尚未发生 BMPA) + $bmpaRunId = (string) (data_get($po->meta, 'batch_mark_paid_and_activate.run_id') ?? ''); + $bmpaStatusText = $bmpaErrMsg !== '' + ? '失败' + : ($bmpaRunId !== '' ? '成功' : '无'); $subscriptionStatusText = ((string) $po->order_type === 'renewal') ? (empty($po->site_subscription_id) ? '缺' : '有') : '-'; diff --git a/tests/Feature/AdminDashboardRecentPlatformOrdersScanlineShouldShowBmpaSuccessWhenRunIdPresentTest.php b/tests/Feature/AdminDashboardRecentPlatformOrdersScanlineShouldShowBmpaSuccessWhenRunIdPresentTest.php new file mode 100644 index 0000000..9365a43 --- /dev/null +++ b/tests/Feature/AdminDashboardRecentPlatformOrdersScanlineShouldShowBmpaSuccessWhenRunIdPresentTest.php @@ -0,0 +1,76 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_dashboard_recent_platform_orders_scanline_should_show_bmpa_success_when_run_id_present(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $platformAdminId = (int) Admin::query()->where('email', 'platform.admin@demo.local')->value('id'); + + $plan = Plan::query()->create([ + 'code' => 'dash_recent_order_bmpa_success_scanline_plan', + 'name' => '仪表盘最近订单 BMPA 成功扫描行测试套餐', + '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, + 'site_subscription_id' => null, + 'created_by_admin_id' => $platformAdminId ?: null, + 'order_no' => 'PO_DASH_BMPA_SUCCESS_SCANLINE_0001', + 'order_type' => 'new_purchase', + 'status' => 'pending', + 'payment_status' => 'unpaid', + 'payable_amount' => 10, + 'paid_amount' => 0, + 'placed_at' => now(), + 'meta' => [ + 'batch_mark_paid_and_activate' => [ + 'run_id' => 'BMPA_RUN_ID_0001', + ], + ], + ]); + + $res = $this->get('/admin'); + $res->assertOk(); + + $res->assertSee('PO_DASH_BMPA_SUCCESS_SCANLINE_0001'); + $res->assertSee('data-role="recent-platform-order-scanline"', false); + + // 关键:BMPA 摘要应显示 “成功”(而不是“正常”) + $res->assertSee('BMPA:', false); + $res->assertSee('成功', false); + + // 且不应出现“BMPA失败”提示块(无 error.message) + $res->assertDontSee('data-role="recent-order-bmpa-failed-hint"', false); + } +}