From 96026b85b50f785e18e0dc4c26dcb1793dba3602 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 6 Oct 2025 09:33:43 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90antd=E3=80=91=E3=80=90ele?= =?UTF-8?q?=E3=80=91=E3=80=90pay=20=E6=94=AF=E4=BB=98=E3=80=91order/refund?= =?UTF-8?q?/transfer=20=E5=AF=BC=E5=87=BA=E7=9A=84=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/pay/app/index.ts | 10 ++-- apps/web-antd/src/api/pay/order/index.ts | 49 ++---------------- apps/web-antd/src/api/pay/refund/index.ts | 50 ++----------------- apps/web-antd/src/api/pay/transfer/index.ts | 15 ++---- apps/web-antd/src/views/pay/order/index.vue | 22 +++++++- apps/web-antd/src/views/pay/refund/index.vue | 22 +++++++- apps/web-antd/src/views/pay/transfer/data.ts | 4 +- .../web-antd/src/views/pay/transfer/index.vue | 22 +++++++- .../src/views/pay/transfer/modules/detail.vue | 18 +++---- apps/web-ele/src/api/pay/app/index.ts | 10 ++-- apps/web-ele/src/api/pay/order/index.ts | 49 ++---------------- apps/web-ele/src/api/pay/refund/index.ts | 50 ++----------------- apps/web-ele/src/api/pay/transfer/index.ts | 27 ++++++---- apps/web-ele/src/views/pay/order/index.vue | 22 +++++++- apps/web-ele/src/views/pay/refund/index.vue | 25 +++++++++- apps/web-ele/src/views/pay/transfer/index.vue | 22 +++++++- 16 files changed, 180 insertions(+), 237 deletions(-) diff --git a/apps/web-antd/src/api/pay/app/index.ts b/apps/web-antd/src/api/pay/app/index.ts index ca78d6d34..081c7aa77 100644 --- a/apps/web-antd/src/api/pay/app/index.ts +++ b/apps/web-antd/src/api/pay/app/index.ts @@ -25,20 +25,16 @@ export namespace PayAppApi { status: number; } - export interface AppPageReq extends PageParam { + export interface AppPageReqVO extends PageParam { name?: string; + appKey?: string; status?: number; - remark?: string; - payNotifyUrl?: string; - refundNotifyUrl?: string; - transferNotifyUrl?: string; - merchantName?: string; createTime?: Date[]; } } /** 查询支付应用列表 */ -export function getAppPage(params: PayAppApi.AppPageReq) { +export function getAppPage(params: PayAppApi.AppPageReqVO) { return requestClient.get>('/pay/app/page', { params, }); diff --git a/apps/web-antd/src/api/pay/order/index.ts b/apps/web-antd/src/api/pay/order/index.ts index aff890dfa..445549192 100644 --- a/apps/web-antd/src/api/pay/order/index.ts +++ b/apps/web-antd/src/api/pay/order/index.ts @@ -40,60 +40,19 @@ export namespace PayOrderApi { } /** 支付订单分页请求 */ - export interface OrderPageReq extends PageParam { - merchantId?: number; + export interface OrderPageReqVO extends PageParam { appId?: number; - channelId?: number; channelCode?: string; merchantOrderId?: string; - subject?: string; - body?: string; - notifyUrl?: string; - notifyStatus?: number; - amount?: number; - channelFeeRate?: number; - channelFeeAmount?: number; - status?: number; - expireTime?: Date[]; - successTime?: Date[]; - notifyTime?: Date[]; - successExtensionId?: number; - refundStatus?: number; - refundTimes?: number; - channelUserId?: string; channelOrderNo?: string; - createTime?: Date[]; - } - - /** 支付订单导出请求 */ - export interface OrderExportReq { - merchantId?: number; - appId?: number; - channelId?: number; - channelCode?: string; - merchantOrderId?: string; - subject?: string; - body?: string; - notifyUrl?: string; - notifyStatus?: number; - amount?: number; - channelFeeRate?: number; - channelFeeAmount?: number; + no?: string; status?: number; - expireTime?: Date[]; - successTime?: Date[]; - notifyTime?: Date[]; - successExtensionId?: number; - refundStatus?: number; - refundTimes?: number; - channelUserId?: string; - channelOrderNo?: string; createTime?: Date[]; } } /** 查询支付订单列表 */ -export function getOrderPage(params: PayOrderApi.OrderPageReq) { +export function getOrderPage(params: PayOrderApi.OrderPageReqVO) { return requestClient.get>('/pay/order/page', { params, }); @@ -120,6 +79,6 @@ export function submitOrder(data: any) { } /** 导出支付订单 */ -export function exportOrder(params: PayOrderApi.OrderExportReq) { +export function exportOrder(params: any) { return requestClient.download('/pay/order/export-excel', { params }); } diff --git a/apps/web-antd/src/api/pay/refund/index.ts b/apps/web-antd/src/api/pay/refund/index.ts index 96e6b3c3f..bce2448bc 100644 --- a/apps/web-antd/src/api/pay/refund/index.ts +++ b/apps/web-antd/src/api/pay/refund/index.ts @@ -38,36 +38,7 @@ export namespace PayRefundApi { } /** 退款订单分页请求 */ - export interface RefundPageReq extends PageParam { - merchantId?: number; - appId?: number; - channelId?: number; - channelCode?: string; - orderId?: string; - tradeNo?: string; - merchantOrderId?: string; - merchantRefundNo?: string; - notifyUrl?: string; - notifyStatus?: number; - status?: number; - type?: number; - payAmount?: number; - refundAmount?: number; - reason?: string; - userIp?: string; - channelOrderNo?: string; - channelRefundNo?: string; - channelErrorCode?: string; - channelErrorMsg?: string; - channelExtras?: string; - expireTime?: Date[]; - successTime?: Date[]; - notifyTime?: Date[]; - createTime?: Date[]; - } - - /** 退款订单导出请求 */ - export interface RefundExportReq { + export interface RefundPageReqVO extends PageParam { merchantId?: number; appId?: number; channelId?: number; @@ -97,7 +68,7 @@ export namespace PayRefundApi { } /** 查询退款订单列表 */ -export function getRefundPage(params: PayRefundApi.RefundPageReq) { +export function getRefundPage(params: PayRefundApi.RefundPageReqVO) { return requestClient.get>( '/pay/refund/page', { @@ -111,22 +82,7 @@ export function getRefund(id: number) { return requestClient.get(`/pay/refund/get?id=${id}`); } -/** 创建退款订单 */ -export function createRefund(data: PayRefundApi.Refund) { - return requestClient.post('/pay/refund/create', data); -} - -/** 更新退款订单 */ -export function updateRefund(data: PayRefundApi.Refund) { - return requestClient.put('/pay/refund/update', data); -} - -/** 删除退款订单 */ -export function deleteRefund(id: number) { - return requestClient.delete(`/pay/refund/delete?id=${id}`); -} - /** 导出退款订单 */ -export function exportRefund(params: PayRefundApi.RefundExportReq) { +export function exportRefund(params: any) { return requestClient.download('/pay/refund/export-excel', { params }); } diff --git a/apps/web-antd/src/api/pay/transfer/index.ts b/apps/web-antd/src/api/pay/transfer/index.ts index f079c6a36..75cd21153 100644 --- a/apps/web-antd/src/api/pay/transfer/index.ts +++ b/apps/web-antd/src/api/pay/transfer/index.ts @@ -27,26 +27,21 @@ export namespace PayTransferApi { } /** 转账单分页请求 */ - export interface TransferPageReq extends PageParam { + export interface TransferPageReqVO extends PageParam { no?: string; appId?: number; - channelId?: number; channelCode?: string; - merchantTransferId?: string; - channelTransferNo?: string; - type?: number; - price?: number; - subject?: string; + merchantOrderId?: string; + status?: number; userName?: string; userAccount?: string; - status?: number; - successTime?: Date[]; + channelTransferNo?: string; createTime?: Date[]; } } /** 查询转账单列表 */ -export function getTransferPage(params: PayTransferApi.TransferPageReq) { +export function getTransferPage(params: PayTransferApi.TransferPageReqVO) { return requestClient.get>( '/pay/transfer/page', { diff --git a/apps/web-antd/src/views/pay/order/index.vue b/apps/web-antd/src/views/pay/order/index.vue index 42aeefba0..c8c88bdc3 100644 --- a/apps/web-antd/src/views/pay/order/index.vue +++ b/apps/web-antd/src/views/pay/order/index.vue @@ -3,11 +3,12 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { PayOrderApi } from '#/api/pay/order'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { downloadFileFromBlobPart } from '@vben/utils'; import { Tag } from 'ant-design-vue'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; -import { getOrderPage } from '#/api/pay/order'; +import { exportOrder, getOrderPage } from '#/api/pay/order'; import { $t } from '#/locales'; import { useGridColumns, useGridFormSchema } from './data'; @@ -23,6 +24,12 @@ function handleRefresh() { gridApi.query(); } +/** 导出支付订单 */ +async function handleExport() { + const data = await exportOrder(await gridApi.formApi.getValues()); + downloadFileFromBlobPart({ fileName: '支付订单.xls', source: data }); +} + /** 查看详情 */ function handleDetail(row: PayOrderApi.Order) { detailModalApi.setData(row).open(); @@ -80,6 +87,19 @@ const [Grid, gridApi] = useVbenVxeGrid({ +