linxianzhuang/saasshop
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(admin): platform orders export include subscription id

Browse Source
This commit is contained in:
萝卜
2026-03-10 13:17:06 +00:00
parent 80890b0b9a
commit db8730e072
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/PlatformOrderController.php
View File

@@ -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->paid_at)->format('Y-m-d H:i:s') ?: '',
optional($order->activated_at)->format('Y-m-d H:i:s') ?: '', optional($order->activated_at)->format('Y-m-d H:i:s') ?: '',
$syncStatus, $syncStatus,
(int) ($order->site_subscription_id ?? 0),
$order->siteSubscription?->subscription_no ?: '', $order->siteSubscription?->subscription_no ?: '',
optional($order->siteSubscription?->ends_at)->format('Y-m-d H:i:s') ?: '', optional($order->siteSubscription?->ends_at)->format('Y-m-d H:i:s') ?: '',
(string) (data_get($order->meta, 'subscription_activation.synced_at') ?? ''), (string) (data_get($order->meta, 'subscription_activation.synced_at') ?? ''),

1
tests/Feature/AdminPlatformOrderExportTest.php
View File

@@ -122,6 +122,7 @@ class AdminPlatformOrderExportTest extends TestCase
$this->assertStringContainsString('订单号', $content); $this->assertStringContainsString('订单号', $content);
$this->assertStringContainsString('PO_EXPORT_0001', $content); $this->assertStringContainsString('PO_EXPORT_0001', $content);
$this->assertStringContainsString('同步失败原因', $content); $this->assertStringContainsString('同步失败原因', $content);
$this->assertStringContainsString('订阅ID', $content);
// include_meta=1 时应包含 meta(JSON) 列 // include_meta=1 时应包含 meta(JSON) 列
$res2 = $this->get('/admin/platform-orders/export?include_meta=1'); $res2 = $this->get('/admin/platform-orders/export?include_meta=1');