diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php index 0e0a0ec..22f3a73 100644 --- a/app/Http/Controllers/Admin/PlatformOrderController.php +++ b/app/Http/Controllers/Admin/PlatformOrderController.php @@ -262,6 +262,7 @@ class PlatformOrderController extends Controller '支付时间', '生效时间', '同步状态', + '订阅ID', '订阅号', '订阅到期', '同步时间', @@ -302,6 +303,7 @@ class PlatformOrderController extends Controller optional($order->paid_at)->format('Y-m-d H:i:s') ?: '', optional($order->activated_at)->format('Y-m-d H:i:s') ?: '', $syncStatus, + (int) ($order->site_subscription_id ?? 0), $order->siteSubscription?->subscription_no ?: '', optional($order->siteSubscription?->ends_at)->format('Y-m-d H:i:s') ?: '', (string) (data_get($order->meta, 'subscription_activation.synced_at') ?? ''), diff --git a/tests/Feature/AdminPlatformOrderExportTest.php b/tests/Feature/AdminPlatformOrderExportTest.php index e6681b4..a9257b3 100644 --- a/tests/Feature/AdminPlatformOrderExportTest.php +++ b/tests/Feature/AdminPlatformOrderExportTest.php @@ -122,6 +122,7 @@ class AdminPlatformOrderExportTest extends TestCase $this->assertStringContainsString('订单号', $content); $this->assertStringContainsString('PO_EXPORT_0001', $content); $this->assertStringContainsString('同步失败原因', $content); + $this->assertStringContainsString('订阅ID', $content); // include_meta=1 时应包含 meta(JSON) 列 $res2 = $this->get('/admin/platform-orders/export?include_meta=1');