diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php index 3cdae958..4debc586 100644 --- a/app/Http/Controllers/Business/Pages.php +++ b/app/Http/Controllers/Business/Pages.php @@ -7179,7 +7179,8 @@ class Pages extends Controller 'has_more' => (bool) ($result['has_more'] ?? false), 'rows' => collect($result['data'] ?? [])->map(static fn (object $row): array => [ 'after_sales_no' => (string) ($row->as_id ?? ''), - 'outer_as_id' => (string) ($row->outer_as_id ?? ''), + 'external_after_sales_no' => (string) ($row->outer_as_id ?? ''), + 'online_order_no' => (string) ($row->so_id ?? ''), 'internal_order_no' => (string) ($row->o_id ?? ''), 'shop_name' => (string) ($row->shop_name ?? ''), 'refund_date' => (string) ($row->refundDate ?? ''), @@ -7315,7 +7316,7 @@ class Pages extends Controller ['label' => '运单号', 'field' => 'waybillNo', 'identifier' => true], ['label' => '订单ID', 'field' => 'o_id', 'identifier' => true], ['label' => '', 'field' => ''], - ['label' => '子订单ID', 'field' => 'so_id', 'identifier' => true], + ['label' => '线上订单号', 'field' => 'so_id', 'identifier' => true], ['label' => '类型', 'field' => 'type'], ['label' => '节点', 'field' => 'node'], ['label' => '是否自营', 'field' => 'isZC'], diff --git a/resources/views/business/pages/refunds/non-jingxi-refund-data.blade.php b/resources/views/business/pages/refunds/non-jingxi-refund-data.blade.php index 653765ea..0ee5cef9 100644 --- a/resources/views/business/pages/refunds/non-jingxi-refund-data.blade.php +++ b/resources/views/business/pages/refunds/non-jingxi-refund-data.blade.php @@ -10,7 +10,7 @@ ['label' => '运单号', 'field' => 'waybillNo'], ['label' => '订单ID', 'field' => 'o_id'], ['label' => '', 'field' => ''], - ['label' => '子订单ID', 'field' => 'so_id'], + ['label' => '线上订单号', 'field' => 'so_id'], ['label' => '类型', 'field' => 'type'], ['label' => '节点', 'field' => 'node'], ['label' => '是否自营', 'field' => 'isZC'], @@ -331,8 +331,9 @@ const columns = [ ['售后单号', 'after_sales_no'], + ['外部售后单号', 'external_after_sales_no'], ['内部订单号', 'internal_order_no'], - ['线上订单号', 'outer_as_id'], + ['线上订单号', 'online_order_no'], ['店铺名称', 'shop_name'], ['退款日期', 'refund_date'], ['状态', 'status'], diff --git a/tests/Feature/Business/NonJingxiRefundPageTest.php b/tests/Feature/Business/NonJingxiRefundPageTest.php index 94072a4b..9d5e0ea0 100644 --- a/tests/Feature/Business/NonJingxiRefundPageTest.php +++ b/tests/Feature/Business/NonJingxiRefundPageTest.php @@ -104,6 +104,7 @@ class NonJingxiRefundPageTest extends FeatureTestCase ->assertDontSee('2026-08-20 10:00:00.123456', false) ->assertSeeText('业务来源') ->assertSeeText('商品明细') + ->assertSeeText('线上订单号') ->assertSeeText('SKU-1') ->assertSeeText('99.50') ->assertSeeText('共 26 条记录') @@ -196,7 +197,8 @@ class NonJingxiRefundPageTest extends FeatureTestCase 'data' => [(object) [ 'refundDate' => '2026-10-29 12:51:37', 'as_id' => 743441809, - 'outer_as_id' => '47500000001', + 'outer_as_id' => '47467351078', + 'so_id' => '3668475003538709', 'waybillNo' => 'WB-743441809', 'o_id' => 10001001, 'shop_name' => '京东-米客米家旗舰店', @@ -221,6 +223,8 @@ class NonJingxiRefundPageTest extends FeatureTestCase ->assertJsonPath('page', 2) ->assertJsonPath('has_more', true) ->assertJsonPath('rows.0.after_sales_no', '743441809') + ->assertJsonPath('rows.0.external_after_sales_no', '47467351078') + ->assertJsonPath('rows.0.online_order_no', '3668475003538709') ->assertJsonPath('rows.0.internal_order_no', '10001001') ->assertJsonPath('rows.0.status', '待确认') ->assertJsonPath('rows.0.online_status', '退款成功') @@ -291,6 +295,9 @@ class NonJingxiRefundPageTest extends FeatureTestCase $content = $response->streamedContent(); $this->assertStringStartsWith("\xEF\xBB\xBF", $content); $this->assertStringContainsString('序号/主键ID', $content); + $this->assertStringContainsString('线上订单号', $content); + $this->assertStringContainsString('ORDER-1', $content); + $this->assertStringNotContainsString('子订单ID', $content); $this->assertStringContainsString('AS-2002', $content); $this->assertStringContainsString('WB-2002', $content); $this->assertStringContainsString('2026-08-20 10:00:00', $content);