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:59:46 +00:00
parent 2d380e180b
commit 4aa44258f8
3 changed files with 25 additions and 19 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 . '#add-payment-receipt';
$noReceiptFixUrlRow = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#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 . '#payment-receipts';
$reconcileShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#payment-receipts';
@endphp
@if($isReconcileMismatchRow)
@php $reconcileFixUrl = '/admin/platform-orders/' . $order->id . '#add-payment-receipt'; @endphp
@php $reconcileFixUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#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 . '#payment-receipts';
$receiptCountShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#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 . '#refund-receipts';
$refundCountShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#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 . '#refund-receipts';
$refundShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#refund-receipts';
@endphp
@if($refundTotal > 0)
@if($isRefundInconsistent)
@php $refundFixUrl = '/admin/platform-orders/' . $order->id . '#refund-receipts'; @endphp
@php $refundFixUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#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 . '#add-payment-receipt';
$refundFixUrlCompact = '/admin/platform-orders/' . $order->id . '#refund-receipts';
$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';
@endphp
@if($needReconcileFix || $needRefundFix)

15
tests/Feature/AdminPlatformOrderReconcileMismatchRowHintTest.php
View File

@@ -62,11 +62,14 @@ class AdminPlatformOrderReconcileMismatchRowHintTest extends TestCase
],
]);
$this->get('/admin/platform-orders?reconcile_mismatch=1')
->assertOk()
->assertSee('PO_RECON_ROW_HINT_0001')
->assertSee('/admin/platform-orders/' . $order->id . '#payment-receipts', false)
->assertSee('/admin/platform-orders/' . $order->id . '#add-payment-receipt', false)
->assertSee('对账不一致');
$res = $this->get('/admin/platform-orders?reconcile_mismatch=1');
$res->assertOk();
$res->assertSee('PO_RECON_ROW_HINT_0001');
$indexSelfWithoutBack = '/admin/platform-orders?reconcile_mismatch=1';
$res->assertSee('/admin/platform-orders/' . $order->id . '?back=' . urlencode($indexSelfWithoutBack) . '#payment-receipts', false);
$res->assertSee('/admin/platform-orders/' . $order->id . '?back=' . urlencode($indexSelfWithoutBack) . '#add-payment-receipt', false);
$res->assertSee('对账不一致');
}
}

11
tests/Feature/AdminPlatformOrderRefundInconsistentRowHintFixLinkTest.php
View File

@@ -63,9 +63,12 @@ class AdminPlatformOrderRefundInconsistentRowHintFixLinkTest extends TestCase
],
]);
$this->get('/admin/platform-orders?refund_inconsistent=1')
->assertOk()
->assertSee('/admin/platform-orders/' . $order->id . '#refund-receipts', false)
->assertSee('去核对退款');
$res = $this->get('/admin/platform-orders?refund_inconsistent=1');
$res->assertOk();
$indexSelfWithoutBack = '/admin/platform-orders?refund_inconsistent=1';
$res->assertSee('/admin/platform-orders/' . $order->id . '?back=' . urlencode($indexSelfWithoutBack) . '#refund-receipts', false);
$res->assertSee('去核对退款');
}
}