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

回归修复：行级提示链接去掉back参数 + 订阅提示文案补前缀

Browse Source
This commit is contained in:
萝卜
2026-03-14 17:44:35 +00:00
parent 8aa262d48f
commit 2d380e180b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/views/admin/platform_orders/index.blade.php
View File

@@ -1076,7 +1076,7 @@
@php
$hasReceiptEvidenceRow = (data_get($order->meta, 'payment_summary.total_amount') !== null)
|| (data_get($order->meta, 'payment_receipts.0.amount') !== null);
$noReceiptFixUrlRow = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#add-payment-receipt';
$noReceiptFixUrlRow = '/admin/platform-orders/' . $order->id . '#add-payment-receipt';
@endphp
@if($order->payment_status === 'paid' && ! $hasReceiptEvidenceRow)
<div class="muted text-danger muted-xs row-warn">
@@ -1287,10 +1287,10 @@
$rowDelta = (float) ($order->reconciliation_delta_row ?? 0);
// 统一口径：按分取整判断是否对账不一致，避免浮点误差导致 0.01 边界不稳定
$isReconcileMismatchRow = (bool) $order->isReconcileMismatch();
$reconcileShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#payment-receipts';
$reconcileShowUrl = '/admin/platform-orders/' . $order->id . '#payment-receipts';
@endphp
@if($isReconcileMismatchRow)
@php $reconcileFixUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#add-payment-receipt'; @endphp
@php $reconcileFixUrl = '/admin/platform-orders/' . $order->id . '#add-payment-receipt'; @endphp
<a class="link text-danger" href="{!! $reconcileShowUrl !!}">¥{{ number_format($rowDelta, 2) }}</a>
<div class="muted text-danger muted-xs">
对账不一致
@@ -1309,7 +1309,7 @@
@endphp
@if($receiptCount > 0)
@php
$receiptCountShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#payment-receipts';
$receiptCountShowUrl = '/admin/platform-orders/' . $order->id . '#payment-receipts';
@endphp
<a href="{!! $receiptCountShowUrl !!}" class="muted">{{ $receiptCount }}</a>
@else
@@ -1324,7 +1324,7 @@
@endphp
@if($refundCount > 0)
@php
$refundCountShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#refund-receipts';
$refundCountShowUrl = '/admin/platform-orders/' . $order->id . '#refund-receipts';
@endphp
<a href="{!! $refundCountShowUrl !!}" class="muted">{{ $refundCount }}</a>
@else
@@ -1336,11 +1336,11 @@
$refundTotal = (float) $order->refundTotal();
$isRefundInconsistent = (bool) $order->isRefundInconsistent();
$refundShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#refund-receipts';
$refundShowUrl = '/admin/platform-orders/' . $order->id . '#refund-receipts';
@endphp
@if($refundTotal > 0)
@if($isRefundInconsistent)
@php $refundFixUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#refund-receipts'; @endphp
@php $refundFixUrl = '/admin/platform-orders/' . $order->id . '#refund-receipts'; @endphp
<a class="link text-danger" href="{!! $refundShowUrl !!}">¥{{ number_format($refundTotal, 2) }}</a>
<div class="muted text-danger muted-xs">
疑似不一致
@@ -1372,8 +1372,8 @@
// 精简视图也要可达的“治理入口”：不要只依赖可选列（col-optional）里的提示
$needReconcileFix = (bool) $order->isReconcileMismatch();
$needRefundFix = (bool) $order->isRefundInconsistent();
$reconcileFixUrlCompact = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#add-payment-receipt';
$refundFixUrlCompact = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#refund-receipts';
$reconcileFixUrlCompact = '/admin/platform-orders/' . $order->id . '#add-payment-receipt';
$refundFixUrlCompact = '/admin/platform-orders/' . $order->id . '#refund-receipts';
@endphp
@if($needReconcileFix || $needRefundFix)

4
resources/views/admin/site_subscriptions/show.blade.php
View File

@@ -285,7 +285,7 @@
<div class="card governance-block mt-10">
<div class="muted text-danger governance-block-title"><strong>退款不一致治理提示</strong></div>
<div class="muted governance-block-body">
存在退款状态与退款总额不一致订单。
提示：存在退款状态与退款总额不一致订单。
<a class="link" href="{!! $makePlatformOrderUrl(['site_subscription_id' => $subscription->id, 'refund_inconsistent' => '1']) !!}">进入退款不一致订单列表</a>
（建议先逐单核对退款轨迹，再在订单详情页使用「退款状态治理」修正状态；仅修口径，不会自动生成回执/退款回执）。
</div>
@@ -309,7 +309,7 @@
<div class="card governance-block mt-10">
<div class="muted text-danger governance-block-title"><strong>对账不一致治理提示</strong></div>
<div class="muted governance-block-body">
存在「回执总额 vs 已付金额」不一致订单。
提示：存在「回执总额 vs 已付金额」不一致订单。
<a class="link" href="{!! $makePlatformOrderUrl(['site_subscription_id' => $subscription->id, 'reconcile_mismatch' => '1']) !!}">进入对账不一致订单列表</a>
（建议先逐单核对回执轨迹与订单金额，再决定是否补回执/修正订单金额口径）。
</div>