diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 88a0367f..31fd2f7a 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -132,12 +132,8 @@ export enum DICT_TYPE { // ========== PAY 模块 ========== PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型 - PAY_CHANNEL_CODE_TYPE = 'pay_channel_code_type', // 支付渠道编码类型 PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态 - PAY_ORDER_REFUND_STATUS = 'pay_order_refund_status', // 商户支付订单退款状态 - PAY_REFUND_ORDER_STATUS = 'pay_refund_order_status', // 退款订单状态 - PAY_REFUND_ORDER_TYPE = 'pay_refund_order_type', // 退款订单类别 - + PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态 PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态 PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态 diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue index e1c3ce31..41da8068 100644 --- a/src/views/pay/app/index.vue +++ b/src/views/pay/app/index.vue @@ -326,7 +326,6 @@ const queryParams = reactive({ createTime: [] }) const queryFormRef = ref() // 搜索的表单 -const exportLoading = ref(false) // 导出的加载中 /** 查询列表 */ const getList = async () => { diff --git a/src/views/pay/refund/RefundDetail.vue b/src/views/pay/refund/RefundDetail.vue new file mode 100644 index 00000000..7e970251 --- /dev/null +++ b/src/views/pay/refund/RefundDetail.vue @@ -0,0 +1,112 @@ + + + + + {{ refundDetail.merchantRefundId }} + + + {{ + refundDetail.channelRefundNo + }} + + + + + {{ refundDetail.merchantOrderId }} + + + {{ refundDetail.channelOrderNo }} + + + + {{ refundDetail.appId }} + {{ refundDetail.appName }} + + + + ¥{{ (refundDetail.payPrice / 100.0).toFixed(2) }} + + + ¥{{ (refundDetail.refundPrice / 100.0).toFixed(2) }} + + + + + + + {{ + formatDate(refundDetail.successTime) + }} + + + {{ + formatDate(refundDetail.createTime) + }} + {{ + formatDate(refundDetail.updateTime) + }} + + + + + + + + {{ refundDetail.reason }} + + + {{ refundDetail.userIp }} + {{ refundDetail.notifyUrl }} + + + + + {{ + refundDetail.channelErrorCode + }} + {{ + refundDetail.channelErrorMsg + }} + + + + {{ refundDetail.channelNotifyData }} + + + + + + diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index 9e8ea198..6eacf933 100644 --- a/src/views/pay/refund/index.vue +++ b/src/views/pay/refund/index.vue @@ -10,21 +10,6 @@ :inline="true" label-width="120px" > - - - - - - + - - - - - - + + + + + + + + + + - - - - - - 搜索 - 重置 + 搜索 + 重置 - - - - - - - - - 退款 - {{ scope.row.merchantRefundNo }} - - - 交易 - {{ scope.row.merchantOrderId }} - - - - - - - 交易 - {{ scope.row.tradeNo }} - - - 渠道 - {{ scope.row.channelOrderNo }} - - - - - - ¥{{ parseFloat(scope.row.payAmount / 100).toFixed(2) }} - - - - - ¥{{ parseFloat(scope.row.refundAmount / 100).toFixed(2) }} - - - - - - - - - - - - - - - - - - + + + ¥{{ parseFloat(scope.row.payPrice / 100).toFixed(2) }} + + + + + ¥{{ parseFloat(scope.row.refundPrice / 100).toFixed(2) }} + + + + + + 商户 {{ scope.row.merchantRefundId }} + + + 退款 {{ scope.row.no }} + + + 渠道 {{ scope.row.channelRefundNo }} + + + + + + + 商户 {{ scope.row.merchantOrderId }} + + + 渠道 {{ scope.row.channelOrderNo }} + + + + + + + + + + + + + + + + {{ scope.row.appName }} + + import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' -// import * as MerchantApi from '@/api/pay/merchant' import * as RefundApi from '@/api/pay/refund' +import * as AppApi from '@/api/pay/app' import RefundDetail from './RefundDetail.vue' import download from '@/utils/download' @@ -254,34 +223,20 @@ const queryParams = reactive({ pageSize: 10, merchantId: undefined, appId: undefined, - channelId: undefined, channelCode: undefined, - orderId: undefined, - tradeNo: undefined, merchantOrderId: undefined, - merchantRefundNo: undefined, - notifyUrl: undefined, - notifyStatus: undefined, + merchantRefundId: undefined, status: undefined, - type: undefined, - payAmount: undefined, - refundAmount: undefined, - reason: undefined, - userIp: undefined, + payPrice: undefined, + refundPrice: undefined, channelOrderNo: undefined, channelRefundNo: undefined, - channelErrorCode: undefined, - channelErrorMsg: undefined, - channelExtras: undefined, - expireTime: [], - successTime: [], - notifyTime: [], - createTime: [] + createTime: [], + successTime: [] }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出等待 const appList = ref([]) // 支付应用列表集合 -const merchantList = ref([]) // 商户列表 /** 搜索按钮操作 */ const handleQuery = () => { @@ -303,7 +258,7 @@ const getList = async () => { /** 重置按钮操作 */ const resetQuery = () => { - queryFormRef.value.resetFields() + queryFormRef.value?.resetFields() handleQuery() } @@ -331,10 +286,7 @@ const openDetail = (id: number) => { /** 初始化 **/ onMounted(async () => { await getList() - // 加载商户列表 - // merchantList.value = await MerchantApi.getMerchantListByName() - // TODO 芋艿:候选少一个查询应用列表的接口 - // appList.value = await AppApi.getAppListByMerchantId() + appList.value = await AppApi.getAppList() })
- 退款 - {{ scope.row.merchantRefundNo }} -
- 交易 - {{ scope.row.merchantOrderId }} -
- 交易 - {{ scope.row.tradeNo }} -
- 渠道 - {{ scope.row.channelOrderNo }} -
+ 商户 {{ scope.row.merchantRefundId }} +
+ 退款 {{ scope.row.no }} +
+ 渠道 {{ scope.row.channelRefundNo }} +
+ 商户 {{ scope.row.merchantOrderId }} +
+ 渠道 {{ scope.row.channelOrderNo }} +