From 223ea1d950e44938e7b9ac2c81e5d099b2d2ee9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Mon, 16 Mar 2026 00:09:42 +0800 Subject: [PATCH] dashboard: recent orders show sync/bmpa failed hints with quick list links --- resources/views/admin/dashboard.blade.php | 31 ++++++- ...ldShowSyncFailedAndBmpaFailedHintsTest.php | 93 +++++++++++++++++++ 2 files changed, 119 insertions(+), 5 deletions(-) create mode 100644 tests/Feature/AdminDashboardRecentPlatformOrdersShouldShowSyncFailedAndBmpaFailedHintsTest.php diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index e71a836..a6ceea5 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -228,27 +228,48 @@ @forelse(($recentPlatformOrders ?? []) as $po) @php $poShowUrl = \App\Support\BackUrl::withBack('/admin/platform-orders/' . $po->id, $selfWithoutBack); - @endphp - @php + $hasReceiptEvidence = (data_get($po->meta, 'payment_summary.total_amount') !== null) || (data_get($po->meta, 'payment_receipts.0.amount') !== null); $fixReceiptUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders/' . $po->id, $selfWithoutBack, 'add-payment-receipt'); + + $syncErrMsg = (string) (data_get($po->meta, 'subscription_activation_error.message') ?? ''); + $bmpaErrMsg = (string) (data_get($po->meta, 'batch_mark_paid_and_activate_error.message') ?? ''); + + $syncFailedListUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?sync_status=failed', $selfWithoutBack); + $bmpaFailedListUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?bmpa_failed_only=1', $selfWithoutBack); @endphp - + {{ $po->order_no }} {{ $po->orderTypeLabel() }} ¥{{ number_format((float) $po->payable_amount, 2) }} {{ $po->payment_status }} @if((string) $po->payment_status === 'paid' && ! $hasReceiptEvidence) -
+
无回执 去补回执
@endif - {{ $po->status }} + + {{ $po->status }} + @if($syncErrMsg !== '') +
+ 同步失败 + + 进入集合 +
+ @endif + @if($bmpaErrMsg !== '') +
+ BMPA失败 + + 进入集合 +
+ @endif + @empty diff --git a/tests/Feature/AdminDashboardRecentPlatformOrdersShouldShowSyncFailedAndBmpaFailedHintsTest.php b/tests/Feature/AdminDashboardRecentPlatformOrdersShouldShowSyncFailedAndBmpaFailedHintsTest.php new file mode 100644 index 0000000..2704a38 --- /dev/null +++ b/tests/Feature/AdminDashboardRecentPlatformOrdersShouldShowSyncFailedAndBmpaFailedHintsTest.php @@ -0,0 +1,93 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_dashboard_recent_platform_orders_should_show_sync_failed_and_bmpa_failed_hints(): void + { + $this->loginAsPlatformAdmin(); + + $merchantId = (int) Merchant::query()->value('id'); + $platformAdminId = (int) Admin::query()->where('email', 'platform.admin@demo.local')->value('id'); + + PlatformOrder::query()->create([ + 'merchant_id' => $merchantId, + 'plan_id' => null, + 'site_subscription_id' => null, + 'created_by_admin_id' => $platformAdminId ?: null, + 'order_no' => 'PO_DASH_SYNC_FAILED_0001', + 'order_type' => 'new_purchase', + 'status' => 'pending', + 'payment_status' => 'paid', + 'payable_amount' => 9, + 'paid_amount' => 9, + 'meta' => [ + 'subscription_activation_error' => [ + 'message' => 'sync failed', + ], + ], + ]); + + PlatformOrder::query()->create([ + 'merchant_id' => $merchantId, + 'plan_id' => null, + 'site_subscription_id' => null, + 'created_by_admin_id' => $platformAdminId ?: null, + 'order_no' => 'PO_DASH_BMPA_FAILED_0001', + 'order_type' => 'new_purchase', + 'status' => 'pending', + 'payment_status' => 'unpaid', + 'payable_amount' => 9, + 'paid_amount' => 0, + 'meta' => [ + 'batch_mark_paid_and_activate_error' => [ + 'message' => 'bmpa failed', + ], + ], + ]); + + $res = $this->get('/admin'); + $res->assertOk(); + + $res->assertSee('PO_DASH_SYNC_FAILED_0001'); + $res->assertSee('同步失败', false); + + $syncFailedUrl = '/admin/platform-orders?' . Arr::query([ + 'sync_status' => 'failed', + 'back' => '/admin', + ]); + $res->assertSee($syncFailedUrl, false); + + $res->assertSee('PO_DASH_BMPA_FAILED_0001'); + $res->assertSee('BMPA失败', false); + + $bmpaFailedUrl = '/admin/platform-orders?' . Arr::query([ + 'bmpa_failed_only' => '1', + 'back' => '/admin', + ]); + $res->assertSee($bmpaFailedUrl, false); + + // 不应出现 &back=,避免回跳断链 + $res->assertDontSee('&back=', false); + } +}