diff --git a/src/utils/dict.ts b/src/utils/dict.ts index d11d1d33..6ca48716 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -131,12 +131,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/order/OrderDetail.vue b/src/views/pay/order/OrderDetail.vue index 3489d4a9..7fe122c2 100644 --- a/src/views/pay/order/OrderDetail.vue +++ b/src/views/pay/order/OrderDetail.vue @@ -7,20 +7,17 @@ {{ detailData.no }} - - + {{ detailData.appId }} {{ detailData.appName }} - - + ¥{{ (detailData.price / 100.0).toFixed(2) }} - - + ¥{{ (detailData.channelFeePrice / 100.0).toFixed(2) }} @@ -29,16 +26,14 @@ {{ (detailData.channelFeeRate / 100.0).toFixed(2) }}% - - + {{ formatDate(detailData.successTime) }} {{ formatDate(detailData.expireTime) }} - - + {{ formatDate(detailData.createTime) }} @@ -46,27 +41,26 @@ {{ formatDate(detailData.updateTime) }} + + {{ detailData.subject }} {{ detailData.body }} - - + {{ detailData.userIp }} - - + {{ detailData.channelOrderNo }} {{ detailData.channelUserId }} - - + ¥{{ (detailData.refundPrice / 100.0).toFixed(2) }} @@ -74,8 +68,10 @@ {{ detailData.notifyUrl }} + + {{ detailData.extension.channelNotifyData }} diff --git a/src/views/pay/refund/RefundDetail.vue b/src/views/pay/refund/RefundDetail.vue index c6a40101..04b548d5 100644 --- a/src/views/pay/refund/RefundDetail.vue +++ b/src/views/pay/refund/RefundDetail.vue @@ -1,86 +1,80 @@ - - - {{ detailData.merchantName }} - {{ detailData.appName }} - {{ detailData.subject }} - - - + + - {{ detailData.merchantRefundNo }} - - - {{ detailData.merchantOrderId }} - - {{ detailData.tradeNo }} - - - - - ¥{{ parseFloat(detailData.payAmount / 100, 2).toFixed(2) }} - - - - ¥{{ parseFloat(detailData.refundAmount / 100).toFixed(2) }} - - - - - - - - - - {{ formatDate(detailData.createTime) }} - - - {{ formatDate(detailData.successTime) }} - - - {{ formatDate(detailData.expireTime) }} - - - {{ formatDate(detailData.updateTime) }} - - - - - - {{ detailData.channelCodeName }} - - - {{ detailData.userIp }} - - {{ detailData.notifyUrl }} - - - - - {{ formatDate(detailData.notifyTime) }} - - - - - - {{ detailData.channelOrderNo }} + {{ refundDetail.merchantRefundId }} - {{ detailData.channelRefundNo }} + {{ + refundDetail.channelRefundNo + }} - - {{ detailData.channelErrorCode }} + + + {{ refundDetail.merchantOrderId }} - - {{ detailData.channelErrorMsg }} + + {{ 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) + }} - - - - {{ detailData.channelExtras }} + + + + + + + + + {{ refundDetail.reason }} + + {{ refundDetail.userIp }} + {{ refundDetail.notifyUrl }} + + + + + + + {{ + refundDetail.channelErrorCode + }} + {{ + refundDetail.channelErrorMsg + }} + + + + + {{ refundDetail.channelNotifyData }} - {{ detailData.reason }} @@ -93,7 +87,7 @@ defineOptions({ name: 'PayRefundDetail' }) const dialogVisible = ref(false) // 弹窗的是否展示 const detailLoading = ref(false) // 表单的加载中 -const detailData = ref({}) +const refundDetail = ref({}) /** 打开弹窗 */ const open = async (id: number) => { @@ -101,7 +95,7 @@ const open = async (id: number) => { // 设置数据 detailLoading.value = true try { - detailData.value = await RefundApi.getRefund(id) + refundDetail.value = await RefundApi.getRefund(id) } finally { detailLoading.value = false } diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index 58e67bad..90c3b093 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 }} +