fix(first-leg): show cancelled orders as terminal details

2026-10-02 22:26:42 +08:00
parent dae119a1e8
commit 187deb5047
8 changed files with 53 additions and 18 deletions
@@ -47,7 +47,7 @@ function clientStatus(status: ApiFirstLegStatus): FirstLegOrder['status'] {
  if (status === 'REJECTED') return 'PENDING_REVIEW'
  if (status === 'APPROVED' || status === 'ACCEPTED' || status === 'PROCESSING') return 'WAIT_MEASURE'
  if (status === 'COMPLETED') return 'COMPLETED'
-  if (status === 'CANCELLED') return 'PENDING_REVIEW'
+  if (status === 'CANCELLED') return 'CANCELLED'
  return 'PENDING_REVIEW'
 }

@@ -384,7 +384,7 @@ function mapUnifiedOrderDetail(detail: MerchantUnifiedOrderDetail, warehouses: P
  if (!detail?.summary || !detail.order?.order) throw new Error('订单详情数据不完整，请刷新列表后重试')
  const mapped = mapOrder(detail.order.order, warehouses, detail.order)
  mapped.id = String(detail.summary.orderId)
-  mapped.status = detail.summary.mainStatus
+  mapped.status = detail.order.order.status === 'CANCELLED' ? 'CANCELLED' : detail.summary.mainStatus
  mapped.fulfillmentType = detail.summary.fulfillmentType ?? mapped.fulfillmentType
  mapped.lxCode = detail.summary.lxCode ?? mapped.lxCode
  mapped.businessSummary = businessSummary(detail.summary)