From 98fa529d01d856e8810795f4b44bbba4d0413e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Tue, 17 Mar 2026 00:03:32 +0800 Subject: [PATCH] Governance: block clear BMPA errors when sync_status/synced_only present --- .../Admin/PlatformOrderController.php | 5 ++ ...rsShouldBlockWhenSyncStatusPresentTest.php | 76 +++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 tests/Feature/AdminPlatformOrderClearBmpaErrorsShouldBlockWhenSyncStatusPresentTest.php diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php index 28daff7..6ddeb77 100644 --- a/app/Http/Controllers/Admin/PlatformOrderController.php +++ b/app/Http/Controllers/Admin/PlatformOrderController.php @@ -2219,10 +2219,15 @@ class PlatformOrderController extends Controller if ((string) ($filters['syncable_only'] ?? '') === '1') { return redirect()->back()->with('warning', '当前已勾选「只看可同步」:该集合与「BMPA失败」治理集合无关,请先取消只看可同步或切到 BMPA 失败集合后再清理。'); } + if ((string) ($filters['fail_only'] ?? '') === '1' || trim((string) ($filters['sync_error_keyword'] ?? '')) !== '') { return redirect()->back()->with('warning', '当前筛选包含「同步失败/失败原因」:该集合用于订阅同步治理,请切到 BMPA 失败集合后再清理 BMPA 失败标记。'); } + if (trim((string) ($filters['sync_status'] ?? '')) !== '' || (string) ($filters['synced_only'] ?? '') === '1') { + return redirect()->back()->with('warning', '当前筛选包含「同步状态/已同步」:该集合用于订阅同步治理,请先清空同步相关筛选后再清理 BMPA 失败标记。'); + } + $hasBmpaScope = ((string) ($filters['bmpa_failed_only'] ?? '') === '1') || (trim((string) ($filters['bmpa_error_keyword'] ?? '')) !== '') || ((string) ($filters['batch_mark_paid_and_activate_24h'] ?? '') === '1'); diff --git a/tests/Feature/AdminPlatformOrderClearBmpaErrorsShouldBlockWhenSyncStatusPresentTest.php b/tests/Feature/AdminPlatformOrderClearBmpaErrorsShouldBlockWhenSyncStatusPresentTest.php new file mode 100644 index 0000000..14ee81a --- /dev/null +++ b/tests/Feature/AdminPlatformOrderClearBmpaErrorsShouldBlockWhenSyncStatusPresentTest.php @@ -0,0 +1,76 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_clear_bmpa_errors_filtered_should_block_when_sync_status_is_present(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'clear_bmpa_err_block_sync_status_plan', + 'name' => '清理BMPA失败标记阻断(sync_status)测试套餐', + 'billing_cycle' => 'monthly', + 'price' => 1, + 'list_price' => 1, + 'status' => 'active', + 'sort' => 10, + 'published_at' => now(), + ]); + + $order = PlatformOrder::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'order_no' => 'PO_CLEAR_BMPA_BLOCK_SYNC_STATUS_0001', + 'order_type' => 'new_purchase', + 'status' => 'pending', + 'payment_status' => 'unpaid', + 'plan_name' => $plan->name, + 'billing_cycle' => $plan->billing_cycle, + 'period_months' => 1, + 'quantity' => 1, + 'payable_amount' => 1, + 'paid_amount' => 0, + 'placed_at' => now(), + 'meta' => [ + 'batch_mark_paid_and_activate_error' => [ + 'message' => '模拟 BMPA 失败', + 'at' => now()->toDateTimeString(), + 'admin_id' => 1, + ], + ], + ]); + + $this->post('/admin/platform-orders/clear-bmpa-errors', [ + 'scope' => 'filtered', + // 故意叠加“同步治理”筛选(与 BMPA 清理互斥) + 'bmpa_failed_only' => '1', + 'sync_status' => 'failed', + ]) + ->assertRedirect() + ->assertSessionHas('warning'); + + $order->refresh(); + $this->assertNotEmpty(data_get($order->meta, 'batch_mark_paid_and_activate_error.message')); + } +}