Governance: block clear BMPA errors when sync_status/synced_only present

This commit is contained in:
萝卜
2026-03-17 00:03:32 +08:00
parent 1e7513a2c5
commit 98fa529d01
2 changed files with 81 additions and 0 deletions

View File

@@ -2219,10 +2219,15 @@ class PlatformOrderController extends Controller
if ((string) ($filters['syncable_only'] ?? '') === '1') { if ((string) ($filters['syncable_only'] ?? '') === '1') {
return redirect()->back()->with('warning', '当前已勾选「只看可同步」该集合与「BMPA失败」治理集合无关请先取消只看可同步或切到 BMPA 失败集合后再清理。'); return redirect()->back()->with('warning', '当前已勾选「只看可同步」该集合与「BMPA失败」治理集合无关请先取消只看可同步或切到 BMPA 失败集合后再清理。');
} }
if ((string) ($filters['fail_only'] ?? '') === '1' || trim((string) ($filters['sync_error_keyword'] ?? '')) !== '') { if ((string) ($filters['fail_only'] ?? '') === '1' || trim((string) ($filters['sync_error_keyword'] ?? '')) !== '') {
return redirect()->back()->with('warning', '当前筛选包含「同步失败/失败原因」:该集合用于订阅同步治理,请切到 BMPA 失败集合后再清理 BMPA 失败标记。'); 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') $hasBmpaScope = ((string) ($filters['bmpa_failed_only'] ?? '') === '1')
|| (trim((string) ($filters['bmpa_error_keyword'] ?? '')) !== '') || (trim((string) ($filters['bmpa_error_keyword'] ?? '')) !== '')
|| ((string) ($filters['batch_mark_paid_and_activate_24h'] ?? '') === '1'); || ((string) ($filters['batch_mark_paid_and_activate_24h'] ?? '') === '1');

View File

@@ -0,0 +1,76 @@
<?php
namespace Tests\Feature;
use App\Models\Merchant;
use App\Models\Plan;
use App\Models\PlatformOrder;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class AdminPlatformOrderClearBmpaErrorsShouldBlockWhenSyncStatusPresentTest extends TestCase
{
use RefreshDatabase;
protected function loginAsPlatformAdmin(): void
{
$this->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'));
}
}