From 54698c10c2fd44f76ab87d44e8ce316173aa1cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Wed, 18 Mar 2026 14:00:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2:=20=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=90=8C=E6=AD=A5=E5=A4=B1=E8=B4=A5=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E6=B8=85=E7=90=86BMPA=E5=86=B2=E7=AA=81=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/admin/platform_orders/index.blade.php | 3 +++ ...rmOrderIndexQuickFiltersShouldNotInheritToolTogglesTest.php | 1 + 2 files changed, 4 insertions(+) diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php index 35108ca..b43be80 100644 --- a/resources/views/admin/platform_orders/index.blade.php +++ b/resources/views/admin/platform_orders/index.blade.php @@ -258,6 +258,9 @@ $subSyncFailedUrl = $buildSubGovernUrl([ 'sync_status' => 'failed', 'syncable_only' => null, + // 从 BMPA 失败上下文切回同步失败集合：清理冲突开关 + 'bmpa_failed_only' => null, + 'bmpa_error_keyword' => null, ]); $subUnpaidUrl = $buildSubGovernUrl([ diff --git a/tests/Feature/AdminPlatformOrderIndexQuickFiltersShouldNotInheritToolTogglesTest.php b/tests/Feature/AdminPlatformOrderIndexQuickFiltersShouldNotInheritToolTogglesTest.php index 059140f..7e56d27 100644 --- a/tests/Feature/AdminPlatformOrderIndexQuickFiltersShouldNotInheritToolTogglesTest.php +++ b/tests/Feature/AdminPlatformOrderIndexQuickFiltersShouldNotInheritToolTogglesTest.php @@ -40,6 +40,7 @@ class AdminPlatformOrderIndexQuickFiltersShouldNotInheritToolTogglesTest extends $this->assertSame('failed', (string) ($q1['sync_status'] ?? '')); $this->assertSame('1', (string) ($q1['merchant_id'] ?? '')); $this->assertArrayNotHasKey('bmpa_failed_only', $q1); + $this->assertArrayNotHasKey('bmpa_error_keyword', $q1); $this->assertArrayNotHasKey('fail_only', $q1); // 2) 快捷筛选：可BMPA处理