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

平台订单对账明细导出：补充 type 字段

Browse Source
This commit is contained in:
萝卜
2026-03-13 20:49:05 +00:00
parent 470f8fe2f5
commit c6a8792763
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,11 +440,12 @@ class PlatformOrderController extends Controller
fputcsv($out, []); fputcsv($out, []);
// 明细表头 // 明细表头
fputcsv($out, ['record_type', 'channel', 'amount', 'biz_time', 'created_at', 'admin_id', 'note']); fputcsv($out, ['record_type', 'receipt_type', 'channel', 'amount', 'biz_time', 'created_at', 'admin_id', 'note']);
foreach ($paymentReceipts as $r) { foreach ($paymentReceipts as $r) {
fputcsv($out, [ fputcsv($out, [
'payment', 'payment',
(string) (data_get($r, 'type') ?? ''),
(string) (data_get($r, 'channel') ?? ''), (string) (data_get($r, 'channel') ?? ''),
(string) (data_get($r, 'amount') ?? ''), (string) (data_get($r, 'amount') ?? ''),
(string) (data_get($r, 'paid_at') ?? ''), (string) (data_get($r, 'paid_at') ?? ''),
@@ -457,6 +458,7 @@ class PlatformOrderController extends Controller
foreach ($refundReceipts as $r) { foreach ($refundReceipts as $r) {
fputcsv($out, [ fputcsv($out, [
'refund', 'refund',
(string) (data_get($r, 'type') ?? ''),
(string) (data_get($r, 'channel') ?? ''), (string) (data_get($r, 'channel') ?? ''),
(string) (data_get($r, 'amount') ?? ''), (string) (data_get($r, 'amount') ?? ''),
(string) (data_get($r, 'refunded_at') ?? ''), (string) (data_get($r, 'refunded_at') ?? ''),

8
tests/Feature/AdminPlatformOrderExportLedgerTest.php
View File

@@ -87,11 +87,11 @@ class AdminPlatformOrderExportLedgerTest extends TestCase
$this->assertStringStartsWith("\xEF\xBB\xBF", $content); $this->assertStringStartsWith("\xEF\xBB\xBF", $content);
// 核心表头 // 核心表头
$this->assertStringContainsString('record_type,channel,amount,biz_time,created_at,admin_id,note', $content); $this->assertStringContainsString('record_type,receipt_type,channel,amount,biz_time,created_at,admin_id,note', $content);
// 至少包含一条 payment 与一条 refund 行 // 至少包含一条 payment 与一条 refund 行（包含 type 字段）
$this->assertStringContainsString('payment,offline,10', $content); $this->assertStringContainsString('payment,bank_transfer,offline,10', $content);
$this->assertStringContainsString('refund,offline,1', $content); $this->assertStringContainsString('refund,refund,offline,1', $content);
} }
public function test_show_page_should_render_export_ledger_link(): void public function test_show_page_should_render_export_ledger_link(): void