From 69eabed9892da87403b55d1e90e9dc0c51117e7a Mon Sep 17 00:00:00 2001
From: yueyang <2495544247@qq.com>
Date: Sat, 24 Oct 2026 13:24:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E4=B8=9A=E7=BB=A9?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=95=86=E5=93=81=E9=87=91=E9=A2=9D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Business/Pages.php                      | 3 ---
 config/business_navigation.php                               | 1 -
 .../views/business/pages/partials/directory-table.blade.php  | 1 -
 tests/Feature/Settings/NavigationTest.php                    | 5 +++--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php
index 85a1e394..f62a3536 100644
--- a/app/Http/Controllers/Business/Pages.php
+++ b/app/Http/Controllers/Business/Pages.php
@@ -1400,7 +1400,6 @@ class Pages extends Controller
             SUM(default_compensation_amount) as default_compensation_total,
             SUM(refund_amount) as refund_total,
             SUM(planting_amount) as planting_total,
-            SUM(product_amount) as goods_total,
             SUM(paid_amount) as paid_total,
             SUM({$differenceBaseExpr}) as difference_base,
             SUM(CASE WHEN remark IN ({$fallbackSql}) THEN 1 ELSE 0 END) as basis_fallback_rows,
@@ -1437,7 +1436,6 @@ class Pages extends Controller
             'default_compensation_total' => round((float) ($agg->default_compensation_total ?? 0), 2),
             'refund_total' => round((float) ($agg->refund_total ?? 0), 2),
             'planting_total' => round((float) ($agg->planting_total ?? 0), 2),
-            'goods_total' => round((float) ($agg->goods_total ?? 0), 2),
             'paid_total' => round((float) ($agg->paid_total ?? 0), 2),
             'difference_total' => round($differenceTotal, 2),
             'per_page' => $limit,
@@ -2112,7 +2110,6 @@ class Pages extends Controller
             'default_compensation_amount' => ['default_compensation_amount', '违约赔付（冲减收入）', 'money'],
             'refund_amount' => ['refund_amount', '退款金额', 'money'],
             'planting_amount' => ['planting_amount', '种菜金额', 'money'],
-            'product_amount' => ['product_amount', '商品金额', 'money'],
             'paid_amount' => ['paid_amount', '订单实付金额', 'money'],
             'difference' => ['difference', '差额', 'money'],
             'match_status' => ['match_status', '匹配状态', 'text'],
diff --git a/config/business_navigation.php b/config/business_navigation.php
index 15719d68..32d189e2 100644
--- a/config/business_navigation.php
+++ b/config/business_navigation.php
@@ -835,7 +835,6 @@ $navigation = [
                         ['name' => 'default_compensation_amount', 'label' => '违约赔付（冲减收入）', 'kind' => 'number'],
                         ['name' => 'refund_amount', 'label' => '退款金额', 'kind' => 'number'],
                         ['name' => 'planting_amount', 'label' => '种菜金额', 'kind' => 'number'],
-                        ['name' => 'product_amount', 'label' => '商品金额', 'kind' => 'number'],
                         ['name' => 'paid_amount', 'label' => '订单实付/实收金额', 'kind' => 'number'],
                         ['name' => 'difference', 'label' => '差额', 'kind' => 'number'],
                         ['name' => 'remark', 'label' => '差额异常备注'],
diff --git a/resources/views/business/pages/partials/directory-table.blade.php b/resources/views/business/pages/partials/directory-table.blade.php
index f7c51096..03b268fb 100644
--- a/resources/views/business/pages/partials/directory-table.blade.php
+++ b/resources/views/business/pages/partials/directory-table.blade.php
@@ -1307,7 +1307,6 @@
                 <div class="receipt-match-summary__title">金额构成</div>
                 <div class="receipt-match-summary__items receipt-match-summary__items--amounts">
                     <span class="receipt-match-summary__item receipt-match-summary__item--amount"><em>账单收入合计</em><strong>{{ number_format((float) $receiptStats['income_total'] / 10000, 2) }}<span class="receipt-match-summary__value-unit">万</span></strong></span>
-                    <span class="receipt-match-summary__item receipt-match-summary__item--amount"><em>订单商品金额合计</em><strong>{{ number_format((float) $receiptStats['goods_total'] / 10000, 2) }}<span class="receipt-match-summary__value-unit">万</span></strong></span>
                     <span class="receipt-match-summary__item receipt-match-summary__item--amount"><em>订单实付金额合计</em><strong>{{ number_format((float) ($receiptStats['paid_total'] ?? 0) / 10000, 2) }}<span class="receipt-match-summary__value-unit">万</span></strong></span>
                     <span class="receipt-match-summary__item receipt-match-summary__item--amount"><em>优惠金额合计</em><strong>{{ number_format((float) ($receiptStats['discount_total'] ?? 0) / 10000, 2) }}<span class="receipt-match-summary__value-unit">万</span></strong></span>
                     <span class="receipt-match-summary__item receipt-match-summary__item--amount"><em>冲减金额合计</em><strong>{{ number_format((float) ($receiptStats['offset_total'] ?? 0) / 10000, 2) }}<span class="receipt-match-summary__value-unit">万</span></strong></span>
diff --git a/tests/Feature/Settings/NavigationTest.php b/tests/Feature/Settings/NavigationTest.php
index 6ef709b1..93363b2b 100644
--- a/tests/Feature/Settings/NavigationTest.php
+++ b/tests/Feature/Settings/NavigationTest.php
@@ -90,7 +90,7 @@ class NavigationTest extends FeatureTestCase
             ]))
             ->assertOk()
             ->assertSeeText('业绩明细')
-            // 列顺序：发生时间 → 店铺名称 → 线上单号 → 收入金额 → 商品金额 → 差额 → 匹配状态 → 异常标注
+            // 列顺序：发生时间 → 店铺名称 → 线上单号 → 收入金额 → 差额 → 匹配状态 → 异常标注
             ->assertSee('data-column-key="platform"', false)
             ->assertSee('data-column-key="occurred_date"', false)
             ->assertSee('data-column-key="store_name"', false)
@@ -101,7 +101,6 @@ class NavigationTest extends FeatureTestCase
             ->assertSee('data-column-key="planting_amount"', false)
             ->assertSee('data-column-key="planting_label"', false)
             ->assertSee('data-column-key="default_compensation_amount"', false)
-            ->assertSee('data-column-key="product_amount"', false)
             ->assertSee('data-column-key="difference"', false)
             ->assertSee('data-column-key="match_status"', false)
             ->assertSee('data-column-key="remark"', false)
@@ -110,6 +109,8 @@ class NavigationTest extends FeatureTestCase
                 'data-column-key="planting_label"',
             ], false)
             ->assertSeeText('标签：种菜明细表命中为“种菜报销”，其余聚水潭种菜标签命中为“种菜未报销”')
+            ->assertDontSee('data-column-key="product_amount"', false)
+            ->assertDontSeeText('订单商品金额合计')
             // 子订单号已按业务要求移除。
             ->assertDontSeeText('子订单号')
             // 展示粒度＝一笔账单收款，不再展开发货明细列。
-- 
2.47.2