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 @@