From 8a62ebc125271a5c3f0e8e23850e289222ec2495 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Mon, 19 Aug 2024 18:20:46 +0800 Subject: [PATCH] =?UTF-8?q?style=20=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=92=8C=E5=95=86=E6=88=B7=E9=80=9A=E7=9F=A5=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/daxpay/PaymentEnum.ts | 14 +++ .../notice/callback/CallbackRecordInfo.vue | 12 +- .../notice/callback/CallbackRecordList.vue | 6 +- .../notice/callback/CallbackTaskInfo.vue | 46 ++++---- .../notice/callback/CallbackTaskList.vue | 20 ++-- .../admin/notice/notify/NotifyRecordInfo.vue | 2 +- .../admin/notice/notify/NotifyRecordList.vue | 75 ++++++------ .../admin/notice/notify/NotifyTask.api.ts | 4 +- .../admin/notice/notify/NotifyTaskInfo.vue | 40 ++++--- .../admin/notice/notify/NotifyTaskList.vue | 108 +++++++++--------- .../admin/order/refund/RefundOrderInfo.vue | 6 + .../admin/order/refund/RefundOrderList.vue | 2 +- .../discrepancy/ReconcileDiscrepancyList.vue | 2 +- .../callback/TradeCallbackRecordInfo.vue | 2 +- .../admin/record/close/PayCloseRecordList.vue | 4 +- .../admin/record/flow/TradeFlowRecord.api.ts | 10 ++ .../admin/record/flow/TradeFlowRecordList.vue | 12 +- 17 files changed, 216 insertions(+), 149 deletions(-) diff --git a/src/enums/daxpay/PaymentEnum.ts b/src/enums/daxpay/PaymentEnum.ts index 192077b50..25728eef9 100644 --- a/src/enums/daxpay/PaymentEnum.ts +++ b/src/enums/daxpay/PaymentEnum.ts @@ -24,3 +24,17 @@ export enum TradeTypeEnum { */ TRANSFER = 'transfer', } + +/** + * 客户通知内容类型 + */ +export enum NotifyContentTypeEnum { + /** 支付订单变动通知 */ + PAY = 'PAY', + + /** 退款订单变动通知 */ + REFUND = 'refund', + + /** 支付订单变动通知 */ + TRANSFER = 'transfer', +} diff --git a/src/views/daxpay/admin/notice/callback/CallbackRecordInfo.vue b/src/views/daxpay/admin/notice/callback/CallbackRecordInfo.vue index 1243d272e..b4b52db14 100644 --- a/src/views/daxpay/admin/notice/callback/CallbackRecordInfo.vue +++ b/src/views/daxpay/admin/notice/callback/CallbackRecordInfo.vue @@ -3,8 +3,8 @@ title="查看记录" v-bind="$attrs" :loading="confirmLoading" - :width="modalWidth" - :visible="visible" + :width="1000" + :open="visible" :mask-closable="showable" @cancel="handleCancel" > @@ -17,7 +17,7 @@ {{ info.reqCount || '空' }} - {{ dictConvert('SendType', info.sendType) }} + {{ dictConvert('notice_send_type', info.sendType) }} 是 @@ -68,4 +68,8 @@ }) - + diff --git a/src/views/daxpay/admin/notice/callback/CallbackRecordList.vue b/src/views/daxpay/admin/notice/callback/CallbackRecordList.vue index b95677ca6..caf5aa077 100644 --- a/src/views/daxpay/admin/notice/callback/CallbackRecordList.vue +++ b/src/views/daxpay/admin/notice/callback/CallbackRecordList.vue @@ -24,13 +24,13 @@ diff --git a/src/views/daxpay/admin/notice/callback/CallbackTaskInfo.vue b/src/views/daxpay/admin/notice/callback/CallbackTaskInfo.vue index a9b1c8abf..e20460baf 100644 --- a/src/views/daxpay/admin/notice/callback/CallbackTaskInfo.vue +++ b/src/views/daxpay/admin/notice/callback/CallbackTaskInfo.vue @@ -4,41 +4,47 @@ v-bind="$attrs" :loading="confirmLoading" :width="1200" - :visible="visible" + :open="visible" :mask-closable="showable" @cancel="handleCancel" > - - + + {{ task.tradeNo }} - - {{ dictConvert('tradeType', task.tradeType) }} + + {{ dictConvert('trade_type', task.tradeType) }} - - 是 - 否 + + 成功 + 失败 - - {{ task.sendCount }} + + {{ task.sendCount || 0 }} - - {{ task.nextTime }} + + {{ task.nextTime || '无' }} - - {{ task.delayCount }} + + {{ task.delayCount || 0 }} - - {{ task.url }} + + {{ task.url || '空' }} - - {{ task.latestTime }} + + {{ task.latestTime || '无' }} - + {{ task.createTime }} - + + {{ task.mchNo }} + + + {{ task.appId }} + + diff --git a/src/views/daxpay/admin/notice/callback/CallbackTaskList.vue b/src/views/daxpay/admin/notice/callback/CallbackTaskList.vue index 32d5683b7..02cc5a4c1 100644 --- a/src/views/daxpay/admin/notice/callback/CallbackTaskList.vue +++ b/src/views/daxpay/admin/notice/callback/CallbackTaskList.vue @@ -26,20 +26,26 @@ - + - + - + - + diff --git a/src/views/daxpay/admin/notice/notify/NotifyRecordInfo.vue b/src/views/daxpay/admin/notice/notify/NotifyRecordInfo.vue index 7c2d8c182..b8b7c4981 100644 --- a/src/views/daxpay/admin/notice/notify/NotifyRecordInfo.vue +++ b/src/views/daxpay/admin/notice/notify/NotifyRecordInfo.vue @@ -4,7 +4,7 @@ v-bind="$attrs" :loading="confirmLoading" :width="modalWidth" - :visible="visible" + :open="visible" :mask-closable="showable" @cancel="handleCancel" > diff --git a/src/views/daxpay/admin/notice/notify/NotifyRecordList.vue b/src/views/daxpay/admin/notice/notify/NotifyRecordList.vue index 2870c3d25..aad8c751a 100644 --- a/src/views/daxpay/admin/notice/notify/NotifyRecordList.vue +++ b/src/views/daxpay/admin/notice/notify/NotifyRecordList.vue @@ -4,45 +4,48 @@ v-bind="$attrs" title="通知明细列表" width="60%" - :visible="visible" + :open="visible" @close="visible = false" > - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + +
- - + + {{ task.tradeNo }} - - {{ dictConvert('tradeType', task.tradeType) }} + + {{ dictConvert('notify_content_type', task.notifyType) }} - + 是 否 - + {{ task.sendCount }} - - {{ task.nextTime }} + + {{ task.nextTime || '空' }} - - {{ task.delayCount }} + + {{ task.delayCount || 0 }} - - {{ task.url }} + + {{ task.url || '无' }} - - {{ task.latestTime }} + + {{ task.latestTime || '空' }} - + {{ task.createTime }} - + + {{ task.mchNo }} + + + {{ task.appId }} + + diff --git a/src/views/daxpay/admin/notice/notify/NotifyTaskList.vue b/src/views/daxpay/admin/notice/notify/NotifyTaskList.vue index 587a608c4..c02088b92 100644 --- a/src/views/daxpay/admin/notice/notify/NotifyTaskList.vue +++ b/src/views/daxpay/admin/notice/notify/NotifyTaskList.vue @@ -10,48 +10,51 @@
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + +
- + + - + @@ -83,6 +87,8 @@ import PayOrderInfo from '@/views/daxpay/admin/order/pay/PayOrderInfo.vue' import TransferOrderInfo from '@/views/daxpay/admin/order/transfer/TransferOrderInfo.vue' import NotifyRecordList from './NotifyRecordList.vue' + import { NotifyContentTypeEnum } from '@/enums/daxpay/PaymentEnum' + import RefundOrderInfo from '@/views/daxpay/admin/order/refund/RefundOrderInfo.vue' // 使用hooks const { @@ -114,8 +120,8 @@ ] as QueryField[] }) - const noticeRecordList = ref() - const noticeTaskInfo = ref() + const notifyRecordList = ref() + const notifyTaskInfo = ref() const payOrderInfo = ref() const refundOrderInfo = ref() const transferOrderInfo = ref() @@ -174,23 +180,23 @@ * 查看 */ function show(record) { - noticeTaskInfo.value.init(record) + notifyTaskInfo.value.init(record) } /** * 查看记录列表 */ function showRecord(record) { - noticeRecordList.value.init(record) + notifyRecordList.value.init(record) } /** * 查看订单信息 */ function showOrder(record: NotifyTask) { - if (record.tradeType === 'pay') { + if (record.notifyType === NotifyContentTypeEnum.PAY) { payOrderInfo.value.init(record.tradeNo) - } else if (record.tradeType === 'refund') { + } else if (record.notifyType === NotifyContentTypeEnum.REFUND) { refundOrderInfo.value.init(record.tradeNo) - } else { + } else if (record.notifyType === NotifyContentTypeEnum.TRANSFER) { transferOrderInfo.value.init(record.tradeNo) } } diff --git a/src/views/daxpay/admin/order/refund/RefundOrderInfo.vue b/src/views/daxpay/admin/order/refund/RefundOrderInfo.vue index 157c03f96..975976cf9 100644 --- a/src/views/daxpay/admin/order/refund/RefundOrderInfo.vue +++ b/src/views/daxpay/admin/order/refund/RefundOrderInfo.vue @@ -45,6 +45,12 @@ {{ order.clientIp }} + + {{ order.mchNo }} + + + {{ order.appId }} +