feat 优化退款信息 交易订单信息页面

This commit is contained in:
re-aoharu
2024-04-17 15:50:42 +08:00
parent 3ea7bf79ec
commit 812c680bb8
4 changed files with 27 additions and 34 deletions

View File

@@ -98,7 +98,7 @@ export function allocationById(id) {
*/
export interface PayOrder extends BaseEntity {
payOrder: any
orderNO: string
orderNo: string
payOrderExtra: any
payChannelOrder: any
// 关联的业务号

View File

@@ -3,36 +3,36 @@
title="查看支付单"
v-bind="$attrs"
:loading="confirmLoading"
:width="modalWidth"
:width="1200"
:visible="visible"
:mask-closable="showable"
@cancel="handleCancel"
>
<a-spin :spinning="confirmLoading">
<a-descriptions title="" :column="{ md: 2, sm: 1, xs: 1 }">
<a-descriptions-item label="支付订单号">
<a-descriptions title="" bordered>
<a-descriptions-item label="标题" :span="3" >
{{ order.title }}
</a-descriptions-item>
<a-descriptions-item :span="1" label="支付订单号">
{{ order.orderNo }}
</a-descriptions-item>
<a-descriptions-item label="业务号">
<a-descriptions-item label="业务号" :span="1 ">
{{ order.businessNo }}
</a-descriptions-item>
<a-descriptions-item label="网关订单号">
<a-descriptions-item label="网关订单号" :span="1 ">
{{ order.gatewayOrderNo }}
</a-descriptions-item>
<a-descriptions-item label="标题">
{{ order.title }}
</a-descriptions-item>
<a-descriptions-item label="描述">
{{ orderExtra.description }}
</a-descriptions-item>
<a-descriptions-item label="金额">
{{ order.amount }}
<a-descriptions-item label="金额(元)">
{{ order.amount?(order.amount/100).toFixed(2):0 }}
</a-descriptions-item>
<a-descriptions-item label="可退余额">
{{ order.refundableBalance }}
<a-descriptions-item label="可退余额(元)">
{{ order.refundableBalance?(order.refundableBalance/100).toFixed(2):0 }}
</a-descriptions-item>
<a-descriptions-item label="支付状态">
<a-tag>{{ dictConvert('PayStatus', order.status) }}</a-tag>
{{ dictConvert('PayStatus', order.status) }}
</a-descriptions-item>
<a-descriptions-item label="异步支付">
{{ order.asyncPay ? '是' : '否' }}
@@ -43,12 +43,6 @@
<a-descriptions-item label="异步支付方式">
{{ dictConvert('PayChannel', order.asyncChannel) }}
</a-descriptions-item>
<a-descriptions-item label="支付信息">
<a-tag v-for="o in orderChannel" :key="o.channel">{{ dictConvert('PayChannel', o.channel) }}: {{ o.amount }}</a-tag>
</a-descriptions-item>
<a-descriptions-item label="可退款信息">
<a-tag v-for="o in orderChannel" :key="o.channel">{{ dictConvert('PayChannel', o.channel) }}: {{ o.refundableBalance }}</a-tag>
</a-descriptions-item>
<a-descriptions-item label="客户IP">
{{ orderExtra.clientIp }}
</a-descriptions-item>
@@ -67,13 +61,13 @@
<a-descriptions-item label="签名">
{{ orderExtra.sign }}
</a-descriptions-item>
<a-descriptions-item label="商户扩展参数">
<a-descriptions-item label="商户扩展参数" :span="3">
{{ orderExtra.attach }}
</a-descriptions-item>
<a-descriptions-item label="请求时间">
{{ orderExtra.reqTime }}
</a-descriptions-item>
<a-descriptions-item label="支付时间">
<a-descriptions-item label="支付时间" >
{{ order.payTime }}
</a-descriptions-item>
<a-descriptions-item label="过期时间">

View File

@@ -80,6 +80,7 @@ export interface RefundOrder extends BaseEntity {
paymentId?: string
// 原业务号
businessNo?: string
orderNo:string
// 异步方式关联退款请求号
refundNo?: string
// 网关订单号

View File

@@ -3,33 +3,31 @@
title="退款订单"
v-bind="$attrs"
:loading="confirmLoading"
:width="750"
:width="1200"
:visible="visible"
:mask-closable="showable"
@cancel="handleCancel"
>
<a-descriptions title="" :column="{ md: 2, sm: 1, xs: 1 }">
<a-descriptions-item label="退款ID">
{{ form.id }}
</a-descriptions-item>
<a-descriptions-item label="退款号">
<a-descriptions bordered>
<a-descriptions-item label="退款号" :span="3">
{{ form.refundNo }}
</a-descriptions-item>
<a-descriptions-item label="原支付ID">
{{ form.paymentId }}
<a-descriptions-item label="退款原因" :span="3">
{{ form.reason }}
</a-descriptions-item>
<a-descriptions-item label="原业务号">
<a-descriptions-item label="原业务号" :span="2">
{{ form.businessNo }}
</a-descriptions-item>
<a-descriptions-item label="网关订单号">
{{ form.gatewayOrderNo }}
</a-descriptions-item>
<a-descriptions-item label="原支付标题">
<a-descriptions-item label="原支付标题" :span="3">
{{ form.title }}
</a-descriptions-item>
<a-descriptions-item label="退款原因">
{{ form.reason }}
<a-descriptions-item label="原支付单号" :span="3">
{{ form.orderNo }}
</a-descriptions-item>
<a-descriptions-item label="退款金额(分)">
{{ form.amount }}
</a-descriptions-item>