From d3b7db90e726162ce49d0c2c0d18b4037fb73e46 Mon Sep 17 00:00:00 2001
From: xiaoquan <838115837@qq.com>
Date: Wed, 10 Jun 2026 19:53:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Settlement=20?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- orderAmount → totalAmount
- settlementAmount → actualAmount
- settledAt → paidAt

与 @rent/shared-types 中的类型定义保持一致
---
 apps/merchant-admin/src/pages/finance/Settlements.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/merchant-admin/src/pages/finance/Settlements.tsx b/apps/merchant-admin/src/pages/finance/Settlements.tsx
index 6a56463..a5ccab0 100644
--- a/apps/merchant-admin/src/pages/finance/Settlements.tsx
+++ b/apps/merchant-admin/src/pages/finance/Settlements.tsx
@@ -213,21 +213,21 @@ const Settlements: React.FC = () => {
               {detailModal.data.periodStart} ~ {detailModal.data.periodEnd}
             </Descriptions.Item>
             <Descriptions.Item label="订单数量">{detailModal.data.orderCount} 笔</Descriptions.Item>
-            <Descriptions.Item label="订单总额">{formatMoney(detailModal.data.orderAmount)}</Descriptions.Item>
+            <Descriptions.Item label="订单总额">{formatMoney(detailModal.data.totalAmount)}</Descriptions.Item>
             <Descriptions.Item label="平台服务费">
               <span style={{ color: '#ff4d4f' }}>{formatMoney(detailModal.data.serviceFee)}</span>
             </Descriptions.Item>
             <Descriptions.Item label="结算金额">
               <span style={{ fontWeight: 'bold', color: '#52c41a' }}>
-                {formatMoney(detailModal.data.settlementAmount)}
+                {formatMoney(detailModal.data.actualAmount)}
               </span>
             </Descriptions.Item>
             <Descriptions.Item label="状态">
               <SettlementStatusTag status={detailModal.data.status} />
             </Descriptions.Item>
             <Descriptions.Item label="创建时间">{formatDateTime(detailModal.data.createdAt)}</Descriptions.Item>
-            {detailModal.data.settledAt && (
-              <Descriptions.Item label="结算时间">{formatDateTime(detailModal.data.settledAt)}</Descriptions.Item>
+            {detailModal.data.paidAt && (
+              <Descriptions.Item label="结算时间">{formatDateTime(detailModal.data.paidAt)}</Descriptions.Item>
             )}
           </Descriptions>
         )}