diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 09dfa0d..ee5e3c2 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -883,7 +883,14 @@ ? ($po->isRefundInconsistent() ? '异常' : ($hasRefundTrace ? '有' : '无')) : '-'; - $syncStatusText = $syncErrMsg !== '' ? '失败' : '正常'; + // 同步摘要口径(更贴近治理/复核): + // - 有 error.message:失败 + // - 无 error 且有 subscription_activation.subscription_id:成功(已同步) + // - 否则:无(尚未同步) + $syncSubscriptionId = (string) (data_get($po->meta, 'subscription_activation.subscription_id') ?? ''); + $syncStatusText = $syncErrMsg !== '' + ? '失败' + : ($syncSubscriptionId !== '' ? '成功' : '无'); // BMPA 摘要口径(更贴近治理/复核): // - 有 error.message:失败 diff --git a/tests/Feature/AdminDashboardRecentPlatformOrdersScanlineShouldShowSyncSuccessWhenSubscriptionIdPresentTest.php b/tests/Feature/AdminDashboardRecentPlatformOrdersScanlineShouldShowSyncSuccessWhenSubscriptionIdPresentTest.php new file mode 100644 index 0000000..23a451d --- /dev/null +++ b/tests/Feature/AdminDashboardRecentPlatformOrdersScanlineShouldShowSyncSuccessWhenSubscriptionIdPresentTest.php @@ -0,0 +1,77 @@ +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_sync_success_when_subscription_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_sync_success_scanline_plan', + 'name' => '仪表盘最近订单 同步成功扫描行测试套餐', + '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_SYNC_SUCCESS_SCANLINE_0001', + 'order_type' => 'renewal', + 'status' => 'pending', + 'payment_status' => 'paid', + 'payable_amount' => 10, + 'paid_amount' => 10, + 'placed_at' => now(), + 'meta' => [ + 'payment_summary' => ['total_amount' => 10], + 'subscription_activation' => [ + 'subscription_id' => 12345, + ], + ], + ]); + + $res = $this->get('/admin'); + $res->assertOk(); + + $res->assertSee('PO_DASH_SYNC_SUCCESS_SCANLINE_0001'); + $res->assertSee('data-role="recent-platform-order-scanline"', false); + + // 关键:同步摘要应显示 “成功”(而不是“正常”) + $res->assertSee('同步:', false); + $res->assertSee('成功', false); + + // 且不应出现“同步失败”提示块(无 error.message) + $res->assertDontSee('data-role="recent-order-sync-failed-hint"', false); + } +}