From be00b188b2333fbd78c2ece75da29f81c5c1cbe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= <dev@saasshop.local>
Date: Wed, 11 Mar 2026 08:47:37 +0000
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=9A?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=A2=E9=98=85=E6=B2=BB=E7=90=86=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E6=A1=88=E4=B8=8E=E5=90=8E=E7=AB=AF=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=98=80=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/platform_orders/show.blade.php      | 20 +++++++++++--------
 ...ActivateSubscriptionGovernanceHintTest.php |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/resources/views/admin/platform_orders/show.blade.php b/resources/views/admin/platform_orders/show.blade.php
index 4efa7b2..1ffc6bf 100644
--- a/resources/views/admin/platform_orders/show.blade.php
+++ b/resources/views/admin/platform_orders/show.blade.php
@@ -157,14 +157,18 @@
             <button type="submit" @disabled(! $canActivate || $alreadySynced)>{{ $alreadySynced ? '已同步' : '同步订阅' }}</button>
         </form>
 
-        @if($order->isReconcileMismatch())
-            <div class="muted text-danger" style="margin-top:6px; width:100%;">提示：当前订单命中「对账不一致」，建议先补齐支付回执并核对金额差额后再同步订阅。
-                <a class="link" href="/admin/platform-orders/{{ $order->id }}#add-payment-receipt">去补回执</a>
-            </div>
-        @endif
-        @if($order->isRefundInconsistent())
-            <div class="muted text-danger" style="margin-top:6px; width:100%;">提示：当前订单命中「退款不一致」，建议先核对退款轨迹/状态后再同步订阅。
-                <a class="link" href="/admin/platform-orders/{{ $order->id }}#refund-receipts">去核对退款</a>
+        @if($order->isReconcileMismatch() || $order->isRefundInconsistent())
+            <div class="muted text-danger" style="margin-top:6px; width:100%;">
+                提示：当前订单命中「对账不一致/退款不一致」，为避免带病同步，请先完成金额/状态治理（补回执/核对退款/修正状态）后再同步订阅。
+                @if($order->isReconcileMismatch())
+                    <a class="link" href="/admin/platform-orders/{{ $order->id }}#add-payment-receipt">去补回执</a>
+                @endif
+                @if($order->isReconcileMismatch() && $order->isRefundInconsistent())
+                    <span class="muted">｜</span>
+                @endif
+                @if($order->isRefundInconsistent())
+                    <a class="link" href="/admin/platform-orders/{{ $order->id }}#refund-receipts">去核对退款</a>
+                @endif
             </div>
         @endif
 
diff --git a/tests/Feature/AdminPlatformOrderShowActivateSubscriptionGovernanceHintTest.php b/tests/Feature/AdminPlatformOrderShowActivateSubscriptionGovernanceHintTest.php
index e759bb4..ad9497d 100644
--- a/tests/Feature/AdminPlatformOrderShowActivateSubscriptionGovernanceHintTest.php
+++ b/tests/Feature/AdminPlatformOrderShowActivateSubscriptionGovernanceHintTest.php
@@ -64,7 +64,7 @@ class AdminPlatformOrderShowActivateSubscriptionGovernanceHintTest extends TestC
 
         $this->get('/admin/platform-orders/' . $order->id)
             ->assertOk()
-            ->assertSee('命中「对账不一致」', false)
+            ->assertSee('当前订单命中「对账不一致/退款不一致」', false)
             ->assertSee('#add-payment-receipt', false);
     }
 
@@ -111,7 +111,7 @@ class AdminPlatformOrderShowActivateSubscriptionGovernanceHintTest extends TestC
 
         $this->get('/admin/platform-orders/' . $order->id)
             ->assertOk()
-            ->assertSee('命中「退款不一致」', false)
+            ->assertSee('当前订单命中「对账不一致/退款不一致」', false)
             ->assertSee('#refund-receipts', false);
     }
 }