diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php index cd45797..866c790 100644 --- a/resources/views/admin/platform_orders/index.blade.php +++ b/resources/views/admin/platform_orders/index.blade.php @@ -935,15 +935,15 @@ $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 - ¥{{ number_format($rowDelta, 2) }} + @php $reconcileFixUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#add-payment-receipt'; @endphp + ¥{{ number_format($rowDelta, 2) }}
对账不一致 - 去补回执 + 去补回执
@else ¥0.00 @@ -984,23 +984,23 @@ $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 - ¥{{ number_format($refundTotal, 2) }} + @php $refundFixUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]) . '#refund-receipts'; @endphp + ¥{{ number_format($refundTotal, 2) }}
疑似不一致 - 去核对退款 + 去核对退款
@else - ¥{{ number_format($refundTotal, 2) }} + ¥{{ number_format($refundTotal, 2) }} @endif @else @if($isRefundInconsistent) - - + -
疑似不一致
@else - diff --git a/tests/Feature/AdminPlatformOrderIndexReconcileRefundDeltaLinksContainBackTest.php b/tests/Feature/AdminPlatformOrderIndexReconcileRefundDeltaLinksContainBackTest.php new file mode 100644 index 0000000..3628578 --- /dev/null +++ b/tests/Feature/AdminPlatformOrderIndexReconcileRefundDeltaLinksContainBackTest.php @@ -0,0 +1,95 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_reconcile_delta_and_refund_total_links_should_carry_back_and_anchor(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'po_index_delta_refund_back_plan', + 'name' => '平台订单列表差额/退款总额 back 链接测试套餐', + 'billing_cycle' => 'monthly', + 'price' => 10, + 'list_price' => 10, + 'status' => 'active', + 'sort' => 10, + 'published_at' => now(), + ]); + + $order = PlatformOrder::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'order_no' => 'PO_INDEX_DELTA_BACK_0001', + 'order_type' => 'new_purchase', + 'status' => 'pending', + 'payment_status' => 'unpaid', + 'plan_name' => $plan->name, + 'billing_cycle' => $plan->billing_cycle, + 'period_months' => 1, + 'quantity' => 1, + 'payable_amount' => 10, + 'paid_amount' => 10, + 'placed_at' => now(), + 'meta' => [ + // 制造对账不一致(receipt_total != paid_amount) + 'payment_summary' => ['count' => 1, 'total' => 9], + 'payment_receipts' => [ + ['amount' => 9, 'paid_at' => now()->toDateTimeString(), 'channel' => 'offline', 'note' => 'test'], + ], + // 制造退款轨迹 + 'refund_summary' => ['count' => 1, 'total' => 1], + 'refund_receipts' => [ + ['amount' => 1, 'refunded_at' => now()->toDateTimeString(), 'channel' => 'offline', 'note' => 'test'], + ], + ], + ]); + + $res = $this->get('/admin/platform-orders?status=pending&back=' . urlencode('/admin/plans')); + $res->assertOk(); + + $indexSelfWithoutBack = '/admin/platform-orders?' . Arr::query([ + 'status' => 'pending', + ]); + + $reconcileShowUrl = '/admin/platform-orders/' . $order->id . '?' . Arr::query([ + 'back' => $indexSelfWithoutBack, + ]) . '#payment-receipts'; + + $reconcileFixUrl = '/admin/platform-orders/' . $order->id . '?' . Arr::query([ + 'back' => $indexSelfWithoutBack, + ]) . '#add-payment-receipt'; + + $refundShowUrl = '/admin/platform-orders/' . $order->id . '?' . Arr::query([ + 'back' => $indexSelfWithoutBack, + ]) . '#refund-receipts'; + + $res->assertSee($reconcileShowUrl, false); + $res->assertSee($reconcileFixUrl, false); + $res->assertSee($refundShowUrl, false); + + $res->assertDontSee('back%3D', false); + } +}