From b8b5c8135211337633ea59678b0c40e3aab3879a Mon Sep 17 00:00:00 2001 From: lik Date: Fri, 6 Nov 2026 22:46:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=80=E6=AC=BE=E6=B5=81=E6=B0=B4=E5=8F=B7?= =?UTF-8?q?=E5=B9=B6=E6=94=AF=E6=8C=81=E4=BA=BA=E5=B7=A5=E6=A0=B8=E5=AE=9E?= =?UTF-8?q?=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 支付卡片显示退款单号、退款流水号、失败原因与退款状态 - 人工核实退款弹窗改为双按钮:确认已退款(可填流水号)/ 确认未退款 - refundManual 接口支持传入退款流水号 --- src/api/escort.ts | 3 +- src/types/api.ts | 14 ++++++++ src/views/orders/detail.vue | 66 +++++++++++++++++++++++++++++-------- 3 files changed, 69 insertions(+), 14 deletions(-) diff --git a/src/api/escort.ts b/src/api/escort.ts index 21bff35..99286d0 100644 --- a/src/api/escort.ts +++ b/src/api/escort.ts @@ -50,9 +50,10 @@ export const escortApi = { { method: 'POST' } ), - refundManual: (id: string) => + refundManual: (id: string, refundNo?: string) => request<{ record: EscortRecord }>(`/health/escort-record/${id}/refund/manual`, { method: 'POST', + body: { refundNo: refundNo || '' }, }), refundRetry: (id: string) => diff --git a/src/types/api.ts b/src/types/api.ts index 2b38698..1e26a38 100644 --- a/src/types/api.ts +++ b/src/types/api.ts @@ -89,6 +89,8 @@ export type EscortRecord = { payChannel?: string paymentRecordId?: string | null status?: string + refundNo?: string + refundedAt?: string | null } paymentWindowEnd?: string | null notes?: { @@ -214,6 +216,18 @@ export type PaymentStatusResult = { prepayExpiresAt: string | null timeExpireAt: string | null } + refund?: null | { + outRefundNo: string + refundId: string + status: string + refundAmount: number + successTime: string | null + lastError?: null | { + code: string + message: string + at: string | null + } + } } export type QrLoginResult = { diff --git a/src/views/orders/detail.vue b/src/views/orders/detail.vue index 0b92302..2c5a030 100644 --- a/src/views/orders/detail.vue +++ b/src/views/orders/detail.vue @@ -65,9 +65,9 @@ v-if="record.payment?.status === 'refunding'" variant="danger" :disabled="actionLoading" - @click="manualRefundVisible = true" + @click="openManualRefund" > - 人工核销退款 + 人工核实退款 删除订单 @@ -227,6 +227,14 @@

支付流水ID

{{ record.payment?.paymentRecordId || '-' }}

+ +

+ 退款失败原因:{{ refundErrorText }} +

+

退款状态:{{ refundStatusLabel }}

支付截止:{{ formatDateTime(record.paymentWindowEnd) }}

@@ -342,16 +350,18 @@ - -

请确认已通过线下渠道完成退款,再执行核销。

-

核销后订单支付状态将变为「已退款」,且不可撤销。

-
+ +

请先核实该订单的退款结果(线上退款查微信支付商户平台,线下退款与收款方确认),再选择对应操作。

+

确认已退款:订单支付状态置为「已退款」,不可撤销。

+

确认未退款:订单保持「退款中」,可稍后尝试再次退款。

+ + + + +
{ return map[record.value?.escort?.sexRequirement || 'none'] || '不限' }) +const refundNoDisplay = computed( + () => record.value?.payment?.refundNo || payInfo.value?.refund?.refundId || '' +) + +const outRefundNoDisplay = computed(() => payInfo.value?.refund?.outRefundNo || '') + +const refundErrorText = computed(() => { + const err = payInfo.value?.refund?.lastError + if (!err?.message) return '' + return err.code ? `${err.message}(${err.code})` : err.message +}) + +const refundStatusLabel = computed(() => { + const status = payInfo.value?.refund?.status + if (status === 'abnormal') return '异常,需人工处理' + if (status === 'closed') return '已关闭' + return '' +}) + const canRecordOffline = computed(() => { if (!record.value) return false return record.value.payment?.status === 'unpaid' @@ -563,11 +593,21 @@ const submitRetryRefund = async () => { } } +const openManualRefund = () => { + manualRefundNo.value = payInfo.value?.refund?.refundId || '' + manualRefundVisible.value = true +} + +const confirmNotRefunded = () => { + manualRefundVisible.value = false + notify.info('已确认未退款,订单保持退款中,可稍后尝试再次退款') +} + const submitManualRefund = async () => { if (!record.value) return actionLoading.value = true try { - await escortApi.refundManual(record.value._id) + await escortApi.refundManual(record.value._id, manualRefundNo.value.trim()) notify.success('退款已核销') manualRefundVisible.value = false await load()