Skip to content

Commit 3f90ca3

Browse files
YunaiVgitee-org
YunaiV
authored and
gitee-org
committed
!196 fix: 支付管理/退款订单 对标 vue2
Merge pull request !196 from dhb52/master
2 parents 2ec50ba + 10c121d commit 3f90ca3

File tree

5 files changed

+151
-214
lines changed

5 files changed

+151
-214
lines changed

‎src/utils/dict.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,8 @@ export enum DICT_TYPE {
131131

132132
// ========== PAY 模块 ==========
133133
PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
134-
PAY_CHANNEL_CODE_TYPE = 'pay_channel_code_type', // 支付渠道编码类型
135134
PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
136-
PAY_ORDER_REFUND_STATUS = 'pay_order_refund_status', // 商户支付订单退款状态
137-
PAY_REFUND_ORDER_STATUS = 'pay_refund_order_status', // 退款订单状态
138-
PAY_REFUND_ORDER_TYPE = 'pay_refund_order_type', // 退款订单类别
139-
135+
PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
140136
PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
141137
PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
142138

‎src/views/pay/app/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ const queryParams = reactive({
326326
createTime: []
327327
})
328328
const queryFormRef = ref() // 搜索的表单
329-
const exportLoading = ref(false) // 导出的加载中
330329
331330
/** 查询列表 */
332331
const getList = async () => {

‎src/views/pay/order/OrderDetail.vue

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,17 @@
77
<el-descriptions-item label="支付单号">
88
<el-tag type="warning" size="small" v-if="detailData.no">{{ detailData.no }}</el-tag>
99
</el-descriptions-item>
10-
</el-descriptions>
11-
<el-descriptions :column="2" label-class-name="desc-label">
10+
1211
<el-descriptions-item label="应用编号">{{ detailData.appId }}</el-descriptions-item>
1312
<el-descriptions-item label="应用名称">{{ detailData.appName }}</el-descriptions-item>
14-
</el-descriptions>
15-
<el-descriptions :column="2" label-class-name="desc-label">
13+
1614
<el-descriptions-item label="支付状态">
1715
<dict-tag :type="DICT_TYPE.PAY_ORDER_STATUS" :value="detailData.status" size="small" />
1816
</el-descriptions-item>
1917
<el-descriptions-item label="支付金额">
2018
<el-tag type="success" size="small">￥{{ (detailData.price / 100.0).toFixed(2) }}</el-tag>
2119
</el-descriptions-item>
22-
</el-descriptions>
23-
<el-descriptions :column="2" label-class-name="desc-label">
20+
2421
<el-descriptions-item label="手续费">
2522
<el-tag type="warning" size="small">
2623
￥{{ (detailData.channelFeePrice / 100.0).toFixed(2) }}
@@ -29,53 +26,52 @@
2926
<el-descriptions-item label="手续费比例">
3027
{{ (detailData.channelFeeRate / 100.0).toFixed(2) }}%
3128
</el-descriptions-item>
32-
</el-descriptions>
33-
<el-descriptions :column="2" label-class-name="desc-label">
29+
3430
<el-descriptions-item label="支付时间">
3531
{{ formatDate(detailData.successTime) }}
3632
</el-descriptions-item>
3733
<el-descriptions-item label="失效时间">
3834
{{ formatDate(detailData.expireTime) }}
3935
</el-descriptions-item>
40-
</el-descriptions>
41-
<el-descriptions :column="2" label-class-name="desc-label">
36+
4237
<el-descriptions-item label="创建时间">
4338
{{ formatDate(detailData.createTime) }}
4439
</el-descriptions-item>
4540
<el-descriptions-item label="更新时间">
4641
{{ formatDate(detailData.updateTime) }}
4742
</el-descriptions-item>
4843
</el-descriptions>
44+
4945
<!-- 分割线 -->
5046
<el-divider />
47+
5148
<el-descriptions :column="2" label-class-name="desc-label">
5249
<el-descriptions-item label="商品标题">{{ detailData.subject }}</el-descriptions-item>
5350
<el-descriptions-item label="商品描述">{{ detailData.body }}</el-descriptions-item>
54-
</el-descriptions>
55-
<el-descriptions :column="2" label-class-name="desc-label">
51+
5652
<el-descriptions-item label="支付渠道">
5753
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="detailData.channelCode" />
5854
</el-descriptions-item>
5955
<el-descriptions-item label="支付 IP">{{ detailData.userIp }}</el-descriptions-item>
60-
</el-descriptions>
61-
<el-descriptions :column="2" label-class-name="desc-label">
56+
6257
<el-descriptions-item label="渠道单号">
6358
<el-tag size="mini" type="success" v-if="detailData.channelOrderNo">
6459
{{ detailData.channelOrderNo }}
6560
</el-tag>
6661
</el-descriptions-item>
6762
<el-descriptions-item label="渠道用户">{{ detailData.channelUserId }}</el-descriptions-item>
68-
</el-descriptions>
69-
<el-descriptions :column="2" label-class-name="desc-label">
63+
7064
<el-descriptions-item label="退款金额">
7165
<el-tag size="mini" type="danger">
7266
￥{{ (detailData.refundPrice / 100.0).toFixed(2) }}
7367
</el-tag>
7468
</el-descriptions-item>
7569
<el-descriptions-item label="通知 URL">{{ detailData.notifyUrl }}</el-descriptions-item>
7670
</el-descriptions>
71+
7772
<!-- 分割线 -->
7873
<el-divider />
74+
7975
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
8076
<el-descriptions-item label="支付通道异步回调内容">
8177
{{ detailData.extension.channelNotifyData }}

‎src/views/pay/refund/RefundDetail.vue

Lines changed: 62 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,80 @@
11
<template>
2-
<Dialog v-model="dialogVisible" title="详情" width="50%">
3-
<el-descriptions :column="2">
4-
<el-descriptions-item label="商户名称">{{ detailData.merchantName }}</el-descriptions-item>
5-
<el-descriptions-item label="应用名称">{{ detailData.appName }}</el-descriptions-item>
6-
<el-descriptions-item label="商品名称">{{ detailData.subject }}</el-descriptions-item>
7-
</el-descriptions>
8-
<el-divider />
9-
<el-descriptions :column="2">
2+
<Dialog v-model="dialogVisible" title="详情" width="700px">
3+
<el-descriptions :column="2" label-class-name="desc-label">
104
<el-descriptions-item label="商户退款单号">
11-
<el-tag>{{ detailData.merchantRefundNo }}</el-tag>
5+
<el-tag size="small">{{ refundDetail.merchantRefundId }}</el-tag>
126
</el-descriptions-item>
13-
<el-descriptions-item label="商户订单号">
14-
{{ detailData.merchantOrderId }}
7+
<el-descriptions-item label="渠道退款单号">
8+
<el-tag type="success" size="small" v-if="refundDetail.channelRefundNo">{{
9+
refundDetail.channelRefundNo
10+
}}</el-tag>
1511
</el-descriptions-item>
16-
<el-descriptions-item label="交易订单号">{{ detailData.tradeNo }}</el-descriptions-item>
17-
</el-descriptions>
18-
<el-divider />
19-
<el-descriptions :column="2">
12+
13+
<el-descriptions-item label="商户支付单号">
14+
<el-tag size="small">{{ refundDetail.merchantOrderId }}</el-tag>
15+
</el-descriptions-item>
16+
<el-descriptions-item label="渠道支付单号">
17+
<el-tag type="success" size="small">{{ refundDetail.channelOrderNo }}</el-tag>
18+
</el-descriptions-item>
19+
20+
<el-descriptions-item label="应用编号">{{ refundDetail.appId }}</el-descriptions-item>
21+
<el-descriptions-item label="应用名称">{{ refundDetail.appName }}</el-descriptions-item>
22+
2023
<el-descriptions-item label="支付金额">
21-
<el-tag type="success">￥{{ parseFloat(detailData.payAmount / 100, 2).toFixed(2) }}</el-tag>
24+
<el-tag type="success" size="small"
25+
>￥{{ (refundDetail.payPrice / 100.0).toFixed(2) }}</el-tag
26+
>
2227
</el-descriptions-item>
2328
<el-descriptions-item label="退款金额">
24-
<el-tag class="tag-purple">
25-
￥{{ parseFloat(detailData.refundAmount / 100).toFixed(2) }}
26-
</el-tag>
27-
</el-descriptions-item>
28-
<el-descriptions-item label="退款类型">
29-
<dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_TYPE" :value="detailData.type" />
29+
<el-tag size="mini" type="danger"
30+
>￥{{ (refundDetail.refundPrice / 100.0).toFixed(2) }}</el-tag
31+
>
3032
</el-descriptions-item>
33+
3134
<el-descriptions-item label="退款状态">
32-
<dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_STATUS" :value="detailData.status" />
33-
</el-descriptions-item>
34-
<el-descriptions-item label="创建时间">
35-
{{ formatDate(detailData.createTime) }}
36-
</el-descriptions-item>
37-
<el-descriptions-item label="退款成功时间">
38-
{{ formatDate(detailData.successTime) }}
39-
</el-descriptions-item>
40-
<el-descriptions-item label="退款失效时间">
41-
{{ formatDate(detailData.expireTime) }}
42-
</el-descriptions-item>
43-
<el-descriptions-item label="更新时间">
44-
{{ formatDate(detailData.updateTime) }}
35+
<dict-tag :type="DICT_TYPE.PAY_REFUND_STATUS" :value="refundDetail.status" />
4536
</el-descriptions-item>
37+
<el-descriptions-item label="退款时间">{{
38+
formatDate(refundDetail.successTime)
39+
}}</el-descriptions-item>
40+
41+
<el-descriptions-item label="创建时间">{{
42+
formatDate(refundDetail.createTime)
43+
}}</el-descriptions-item>
44+
<el-descriptions-item label="更新时间">{{
45+
formatDate(refundDetail.updateTime)
46+
}}</el-descriptions-item>
4647
</el-descriptions>
48+
49+
<!-- 分割线 -->
4750
<el-divider />
48-
<el-descriptions :column="2">
49-
<el-descriptions-item label="支付渠道">
50-
{{ detailData.channelCodeName }}
51-
</el-descriptions-item>
52-
<el-descriptions-item label="支付 IP">
53-
{{ detailData.userIp }}
54-
</el-descriptions-item>
55-
<el-descriptions-item label="回调地址">{{ detailData.notifyUrl }}</el-descriptions-item>
56-
<el-descriptions-item label="回调状态">
57-
<dict-tag :type="DICT_TYPE.PAY_ORDER_NOTIFY_STATUS" :value="detailData.notifyStatus" />
58-
</el-descriptions-item>
59-
<el-descriptions-item label="回调时间">
60-
{{ formatDate(detailData.notifyTime) }}
51+
52+
<el-descriptions :column="2" label-class-name="desc-label">
53+
<el-descriptions-item label="退款渠道">
54+
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="refundDetail.channelCode" />
6155
</el-descriptions-item>
56+
<el-descriptions-item label="退款原因">{{ refundDetail.reason }}</el-descriptions-item>
57+
58+
<el-descriptions-item label="退款 IP">{{ refundDetail.userIp }}</el-descriptions-item>
59+
<el-descriptions-item label="通知 URL">{{ refundDetail.notifyUrl }}</el-descriptions-item>
6260
</el-descriptions>
61+
62+
<!-- 分割线 -->
6363
<el-divider />
64-
<el-descriptions :column="2">
65-
<el-descriptions-item label="渠道订单号">
66-
{{ detailData.channelOrderNo }}
67-
</el-descriptions-item>
68-
<el-descriptions-item label="渠道退款单号">
69-
{{ detailData.channelRefundNo }}
70-
</el-descriptions-item>
71-
<el-descriptions-item label="渠道错误码">
72-
{{ detailData.channelErrorCode }}
73-
</el-descriptions-item>
74-
<el-descriptions-item label="渠道错误码描述">
75-
{{ detailData.channelErrorMsg }}
76-
</el-descriptions-item>
64+
65+
<el-descriptions :column="2" label-class-name="desc-label">
66+
<el-descriptions-item label="渠道错误码">{{
67+
refundDetail.channelErrorCode
68+
}}</el-descriptions-item>
69+
<el-descriptions-item label="渠道错误码描述">{{
70+
refundDetail.channelErrorMsg
71+
}}</el-descriptions-item>
7772
</el-descriptions>
78-
<br />
79-
<el-descriptions :column="1" border direction="vertical">
80-
<el-descriptions-item label="渠道额外参数">
81-
{{ detailData.channelExtras }}
73+
74+
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
75+
<el-descriptions-item label="支付通道异步回调内容">
76+
{{ refundDetail.channelNotifyData }}
8277
</el-descriptions-item>
83-
<el-descriptions-item label="退款原因">{{ detailData.reason }}</el-descriptions-item>
8478
</el-descriptions>
8579
</Dialog>
8680
</template>
@@ -93,15 +87,15 @@ defineOptions({ name: 'PayRefundDetail' })
9387
9488
const dialogVisible = ref(false) // 弹窗的是否展示
9589
const detailLoading = ref(false) // 表单的加载中
96-
const detailData = ref({})
90+
const refundDetail = ref({})
9791
9892
/** 打开弹窗 */
9993
const open = async (id: number) => {
10094
dialogVisible.value = true
10195
// 设置数据
10296
detailLoading.value = true
10397
try {
104-
detailData.value = await RefundApi.getRefund(id)
98+
refundDetail.value = await RefundApi.getRefund(id)
10599
} finally {
106100
detailLoading.value = false
107101
}

0 commit comments

Comments
 (0)