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 @@
- 是
- 否
+ 成功
+ 失败
- {{ dictConvert('ClientNoticeSendType', row.sendType) }}
+ {{ dictConvert('notice_send_type', row.sendType) }}
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 @@
-
+
- {{ dictConvert('TradeType', row.tradeType) }}
+ {{ dictConvert('trade_type', row.tradeType) }}
-
+
- 是
- 否
+ 成功
+ 失败
-
+
-
+
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"
>
-
-
-
-
- {{ row.reqCount || '空' }}
-
-
-
-
- 是
- 否
-
-
-
-
- {{ dictConvert('ClientNoticeSendType', row.sendType) }}
-
-
-
-
-
-
-
- 查看
-
-
-
-
+
+
+
+
+
+ {{ row.reqCount || '空' }}
+
+
+
+
+ 是
+ 否
+
+
+
+
+ {{ dictConvert('ClientNoticeSendType', row.sendType) }}
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
-
-
+
+
{{ 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 @@
-
-
-
-
-
- {{ row.tradeNo }}
-
-
-
-
-
- {{ dictConvert('TradeType', row.tradeType) }}
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
- 查看
-
- 记录列表
-
- 重发
-
-
-
+
+
+
+
+
+
+ {{ row.tradeNo }}
+
+
+
+
+
+ {{ dictConvert('notify_content_type', row.notifyType) }}
+
+
+
+
+ 成功
+ 失败
+
+
+
+
+
+
+
+
+
+ 查看
+
+ 记录列表
+
+ 重发
+
+
+
+
-
+
+
-
+
@@ -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 }}
+
取消
diff --git a/src/views/daxpay/admin/order/refund/RefundOrderList.vue b/src/views/daxpay/admin/order/refund/RefundOrderList.vue
index eec1304d0..4e45f46f3 100644
--- a/src/views/daxpay/admin/order/refund/RefundOrderList.vue
+++ b/src/views/daxpay/admin/order/refund/RefundOrderList.vue
@@ -197,7 +197,7 @@
*/
async function initData() {
refundStatusList.value = await dictDropDown('RefundStatus')
- channelList.value = await dictDropDown('PayChannel')
+ channelList.value = await dictDropDown('channel')
}
/**
diff --git a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
index 8107ed415..647f9be54 100644
--- a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
+++ b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
@@ -164,7 +164,7 @@
async function initData() {
tradeTypeList.value = await dictDropDown('PaymentType')
diffTypeList.value = await dictDropDown('ReconcileDiffType')
- payChannelList.value = await dictDropDown('PayChannel')
+ payChannelList.value = await dictDropDown('channel')
}
/**
* 入口
diff --git a/src/views/daxpay/admin/record/callback/TradeCallbackRecordInfo.vue b/src/views/daxpay/admin/record/callback/TradeCallbackRecordInfo.vue
index cc0f1a8b5..6c8ff300b 100644
--- a/src/views/daxpay/admin/record/callback/TradeCallbackRecordInfo.vue
+++ b/src/views/daxpay/admin/record/callback/TradeCallbackRecordInfo.vue
@@ -77,7 +77,7 @@
diff --git a/src/views/daxpay/admin/record/close/PayCloseRecordList.vue b/src/views/daxpay/admin/record/close/PayCloseRecordList.vue
index ac4d9e782..960d745a0 100644
--- a/src/views/daxpay/admin/record/close/PayCloseRecordList.vue
+++ b/src/views/daxpay/admin/record/close/PayCloseRecordList.vue
@@ -150,8 +150,8 @@
* 初始化
*/
async function init() {
- payChannelList.value = await dictDropDown('PayChannel')
- closeTypeList.value = await dictDropDown('PayCloseType')
+ payChannelList.value = await dictDropDown('channel')
+ closeTypeList.value = await dictDropDown('close_type')
}
/**
diff --git a/src/views/daxpay/admin/record/flow/TradeFlowRecord.api.ts b/src/views/daxpay/admin/record/flow/TradeFlowRecord.api.ts
index ef2c2e68a..52aa70aa6 100644
--- a/src/views/daxpay/admin/record/flow/TradeFlowRecord.api.ts
+++ b/src/views/daxpay/admin/record/flow/TradeFlowRecord.api.ts
@@ -22,6 +22,16 @@ export function get(id) {
})
}
+/**
+ * 金额汇总
+ */
+export function amountSummary(params) {
+ return defHttp.get>({
+ url: '/record/flow/summary',
+ params,
+ })
+}
+
/**
* 支付同步记录
*/
diff --git a/src/views/daxpay/admin/record/flow/TradeFlowRecordList.vue b/src/views/daxpay/admin/record/flow/TradeFlowRecordList.vue
index 5127bf3aa..0bf70f97e 100644
--- a/src/views/daxpay/admin/record/flow/TradeFlowRecordList.vue
+++ b/src/views/daxpay/admin/record/flow/TradeFlowRecordList.vue
@@ -83,7 +83,7 @@