diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php index 97c7412..99efe63 100644 --- a/app/Http/Controllers/Admin/PlatformOrderController.php +++ b/app/Http/Controllers/Admin/PlatformOrderController.php @@ -421,6 +421,8 @@ class PlatformOrderController extends Controller '同步时间', '同步失败原因', '同步失败时间', + '最近批量生效时间', + '最近批量生效管理员', ]; if ($includeMeta) { @@ -462,6 +464,8 @@ class PlatformOrderController extends Controller (string) (data_get($order->meta, 'subscription_activation.synced_at') ?? ''), $syncErr, (string) (data_get($order->meta, 'subscription_activation_error.at') ?? ''), + (string) (data_get($order->meta, 'batch_mark_activated.at') ?? ''), + (string) (data_get($order->meta, 'batch_mark_activated.admin_id') ?? ''), ]; if ($includeMeta) { diff --git a/tests/Feature/AdminPlatformOrderExportTest.php b/tests/Feature/AdminPlatformOrderExportTest.php index a9257b3..9ea02fb 100644 --- a/tests/Feature/AdminPlatformOrderExportTest.php +++ b/tests/Feature/AdminPlatformOrderExportTest.php @@ -123,6 +123,8 @@ class AdminPlatformOrderExportTest extends TestCase $this->assertStringContainsString('PO_EXPORT_0001', $content); $this->assertStringContainsString('同步失败原因', $content); $this->assertStringContainsString('订阅ID', $content); + $this->assertStringContainsString('最近批量生效时间', $content); + $this->assertStringContainsString('最近批量生效管理员', $content); // include_meta=1 时应包含 meta(JSON) 列 $res2 = $this->get('/admin/platform-orders/export?include_meta=1');