diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php index b0a8264..ed3d503 100644 --- a/resources/views/admin/platform_orders/index.blade.php +++ b/resources/views/admin/platform_orders/index.blade.php @@ -148,9 +148,11 @@ 'status' => null, ]); + // 待生效口径与仪表盘一致:paid + pending + sync_status=unsynced(排除同步失败等异常单) $leadPaidPendingUrl = $buildLeadGovernUrl([ 'payment_status' => 'paid', 'status' => 'pending', + 'sync_status' => 'unsynced', ]); @endphp @php @@ -266,11 +268,12 @@ 'fail_only' => null, ]); + // 待生效口径与仪表盘一致:paid + pending + sync_status=unsynced(排除同步失败等异常单) $subPaidPendingUrl = $buildSubGovernUrl([ 'payment_status' => 'paid', 'status' => 'pending', 'syncable_only' => null, - 'sync_status' => null, + 'sync_status' => 'unsynced', 'fail_only' => null, ]); @@ -325,7 +328,7 @@ 全部 待支付 可BMPA处理 - 待生效 + 待生效 可同步订阅 同步失败 BMPA失败 diff --git a/tests/Feature/AdminDashboardBillingWorkbenchQuickLinksTest.php b/tests/Feature/AdminDashboardBillingWorkbenchQuickLinksTest.php index b205d3a..1754e50 100644 --- a/tests/Feature/AdminDashboardBillingWorkbenchQuickLinksTest.php +++ b/tests/Feature/AdminDashboardBillingWorkbenchQuickLinksTest.php @@ -28,16 +28,16 @@ class AdminDashboardBillingWorkbenchQuickLinksTest extends TestCase $res->assertSee('快捷筛选'); - $res->assertSee('href="/admin/platform-orders?payment_status=unpaid&status=pending"', false); + $res->assertSee('href="/admin/platform-orders?payment_status=unpaid&status=pending&back=%2Fadmin"', false); $res->assertSee('待支付'); - $res->assertSee('href="/admin/platform-orders?payment_status=paid&status=pending&sync_status=unsynced"', false); + $res->assertSee('href="/admin/platform-orders?payment_status=paid&status=pending&sync_status=unsynced&back=%2Fadmin"', false); $res->assertSee('待生效'); - $res->assertSee('href="/admin/platform-orders?syncable_only=1"', false); + $res->assertSee('href="/admin/platform-orders?syncable_only=1&back=%2Fadmin"', false); $res->assertSee('可同步'); - $res->assertSee('href="/admin/platform-orders?sync_status=failed"', false); + $res->assertSee('href="/admin/platform-orders?sync_status=failed&back=%2Fadmin"', false); $res->assertSee('同步失败'); } } diff --git a/tests/Feature/AdminPlatformOrderTest.php b/tests/Feature/AdminPlatformOrderTest.php index 6ee6f23..b87ed11 100644 --- a/tests/Feature/AdminPlatformOrderTest.php +++ b/tests/Feature/AdminPlatformOrderTest.php @@ -52,7 +52,7 @@ class AdminPlatformOrderTest extends TestCase ->assertSee('已退款') ->assertSee('退款数') ->assertSee('退款总额') - ->assertSee('/admin/platform-orders?payment_status=paid&status=pending', false); + ->assertSee('/admin/platform-orders?payment_status=paid&status=pending&sync_status=unsynced', false); } public function test_guest_cannot_open_platform_orders_page(): void