diff --git a/apps/web-antd/src/api/pay/app/index.ts b/apps/web-antd/src/api/pay/app/index.ts index 081c7aa77..d4b1ab6f7 100644 --- a/apps/web-antd/src/api/pay/app/index.ts +++ b/apps/web-antd/src/api/pay/app/index.ts @@ -20,21 +20,14 @@ export namespace PayAppApi { } /** 更新状态请求 */ - export interface UpdateStatusReq { + export interface AppUpdateStatusReqVO { id: number; status: number; } - - export interface AppPageReqVO extends PageParam { - name?: string; - appKey?: string; - status?: number; - createTime?: Date[]; - } } /** 查询支付应用列表 */ -export function getAppPage(params: PayAppApi.AppPageReqVO) { +export function getAppPage(params: PageParam) { return requestClient.get>('/pay/app/page', { params, }); @@ -56,7 +49,7 @@ export function updateApp(data: PayAppApi.App) { } /** 修改支付应用状态 */ -export function updateAppStatus(data: PayAppApi.UpdateStatusReq) { +export function updateAppStatus(data: PayAppApi.AppUpdateStatusReqVO) { return requestClient.put('/pay/app/update-status', data); } diff --git a/apps/web-antd/src/api/pay/channel/index.ts b/apps/web-antd/src/api/pay/channel/index.ts index eb4c1d99e..99005024c 100644 --- a/apps/web-antd/src/api/pay/channel/index.ts +++ b/apps/web-antd/src/api/pay/channel/index.ts @@ -1,5 +1,3 @@ -import type { PageParam, PageResult } from '@vben/request'; - import { requestClient } from '#/api/request'; export namespace PayChannelApi { @@ -16,16 +14,6 @@ export namespace PayChannelApi { } } -/** 查询支付渠道列表 */ -export function getChannelPage(params: PageParam) { - return requestClient.get>( - '/pay/channel/page', - { - params, - }, - ); -} - /** 查询支付渠道详情 */ export function getChannel(appId: number, code: string) { return requestClient.get('/pay/channel/get', { @@ -42,13 +30,3 @@ export function createChannel(data: PayChannelApi.Channel) { export function updateChannel(data: PayChannelApi.Channel) { return requestClient.put('/pay/channel/update', data); } - -/** 删除支付渠道 */ -export function deleteChannel(id: number) { - return requestClient.delete(`/pay/channel/delete?id=${id}`); -} - -/** 导出支付渠道 */ -export function exportChannel(params: PageParam) { - return requestClient.download('/pay/channel/export-excel', { params }); -} diff --git a/apps/web-antd/src/api/pay/demo/order/index.ts b/apps/web-antd/src/api/pay/demo/order/index.ts index 262351059..0fb178888 100644 --- a/apps/web-antd/src/api/pay/demo/order/index.ts +++ b/apps/web-antd/src/api/pay/demo/order/index.ts @@ -19,11 +19,6 @@ export namespace DemoOrderApi { spuId?: number; createTime?: Date; } - - export interface OrderPageReqVO extends PageParam { - spuId?: number; - createTime?: Date[]; - } } /** 创建示例订单 */ @@ -32,7 +27,7 @@ export function createDemoOrder(data: DemoOrderApi.Order) { } /** 获得示例订单分页 */ -export function getDemoOrderPage(params: DemoOrderApi.OrderPageReqVO) { +export function getDemoOrderPage(params: PageParam) { return requestClient.get>( '/pay/demo-order/page', { diff --git a/apps/web-antd/src/api/pay/notify/index.ts b/apps/web-antd/src/api/pay/notify/index.ts index fe18ac03b..c4fb7b209 100644 --- a/apps/web-antd/src/api/pay/notify/index.ts +++ b/apps/web-antd/src/api/pay/notify/index.ts @@ -22,18 +22,6 @@ export namespace PayNotifyApi { updateTime: Date; logs?: any[]; } - - /** 支付通知任务分页请求 */ - export interface NotifyTaskPageReqVO extends PageParam { - appId?: number; - type?: number; - dataId?: number; - status?: number; - merchantOrderId?: string; - merchantRefundId?: string; - merchantTransferId?: string; - createTime?: Date[]; - } } /** 获得支付通知明细 */ @@ -42,7 +30,7 @@ export function getNotifyTaskDetail(id: number) { } /** 获得支付通知分页 */ -export function getNotifyTaskPage(params: PayNotifyApi.NotifyTaskPageReqVO) { +export function getNotifyTaskPage(params: PageParam) { return requestClient.get>( '/pay/notify/page', { diff --git a/apps/web-antd/src/api/pay/order/index.ts b/apps/web-antd/src/api/pay/order/index.ts index 445549192..0d4cdbf81 100644 --- a/apps/web-antd/src/api/pay/order/index.ts +++ b/apps/web-antd/src/api/pay/order/index.ts @@ -38,21 +38,10 @@ export namespace PayOrderApi { createTime: Date; updateTime: Date; } - - /** 支付订单分页请求 */ - export interface OrderPageReqVO extends PageParam { - appId?: number; - channelCode?: string; - merchantOrderId?: string; - channelOrderNo?: string; - no?: string; - status?: number; - createTime?: Date[]; - } } /** 查询支付订单列表 */ -export function getOrderPage(params: PayOrderApi.OrderPageReqVO) { +export function getOrderPage(params: PageParam) { return requestClient.get>('/pay/order/page', { params, }); diff --git a/apps/web-antd/src/api/pay/refund/index.ts b/apps/web-antd/src/api/pay/refund/index.ts index bce2448bc..a63af4389 100644 --- a/apps/web-antd/src/api/pay/refund/index.ts +++ b/apps/web-antd/src/api/pay/refund/index.ts @@ -36,39 +36,10 @@ export namespace PayRefundApi { createTime: Date; updateTime: Date; } - - /** 退款订单分页请求 */ - export interface RefundPageReqVO 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 function getRefundPage(params: PayRefundApi.RefundPageReqVO) { +export function getRefundPage(params: PageParam) { return requestClient.get>( '/pay/refund/page', { diff --git a/apps/web-antd/src/api/pay/transfer/index.ts b/apps/web-antd/src/api/pay/transfer/index.ts index 75cd21153..280ad4ddc 100644 --- a/apps/web-antd/src/api/pay/transfer/index.ts +++ b/apps/web-antd/src/api/pay/transfer/index.ts @@ -25,23 +25,10 @@ export namespace PayTransferApi { notifyUrl: string; channelNotifyData: string; } - - /** 转账单分页请求 */ - export interface TransferPageReqVO extends PageParam { - no?: string; - appId?: number; - channelCode?: string; - merchantOrderId?: string; - status?: number; - userName?: string; - userAccount?: string; - channelTransferNo?: string; - createTime?: Date[]; - } } /** 查询转账单列表 */ -export function getTransferPage(params: PayTransferApi.TransferPageReqVO) { +export function getTransferPage(params: PageParam) { return requestClient.get>( '/pay/transfer/page', { diff --git a/apps/web-antd/src/api/pay/wallet/balance/index.ts b/apps/web-antd/src/api/pay/wallet/balance/index.ts index fc061d6d8..052a6ec95 100644 --- a/apps/web-antd/src/api/pay/wallet/balance/index.ts +++ b/apps/web-antd/src/api/pay/wallet/balance/index.ts @@ -3,11 +3,6 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace PayWalletApi { - /** 用户钱包查询参数 */ - export interface PayWalletUserReq { - userId: number; - } - /** 钱包信息 */ export interface Wallet { id: number; @@ -19,32 +14,27 @@ export namespace PayWalletApi { freezePrice: number; } - /** 钱包分页请求 */ - export interface WalletPageReqVO extends PageParam { - userId?: number; - userType?: number; - balance?: number; - totalExpense?: number; - totalRecharge?: number; - freezePrice?: number; + /** 钱包查询参数 */ + export interface WalletUserQueryReqVO { + userId: number; } /** 钱包修改余额 */ - export interface PayWalletUpdateBalanceReqVO { + export interface WalletUpdateBalanceReqVO { userId: number; balance: number; } } /** 查询用户钱包详情 */ -export function getWallet(params: PayWalletApi.PayWalletUserReq) { +export function getWallet(params: PayWalletApi.WalletUserQueryReqVO) { return requestClient.get('/pay/wallet/get', { params, }); } /** 查询会员钱包列表 */ -export function getWalletPage(params: PayWalletApi.WalletPageReqVO) { +export function getWalletPage(params: PageParam) { return requestClient.get>( '/pay/wallet/page', { @@ -55,7 +45,7 @@ export function getWalletPage(params: PayWalletApi.WalletPageReqVO) { /** 修改会员钱包余额 */ export function updateWalletBalance( - data: PayWalletApi.PayWalletUpdateBalanceReqVO, + data: PayWalletApi.WalletUpdateBalanceReqVO, ) { return requestClient.put('/pay/wallet/update-balance', data); } diff --git a/apps/web-ele/src/api/pay/app/index.ts b/apps/web-ele/src/api/pay/app/index.ts index 081c7aa77..d4b1ab6f7 100644 --- a/apps/web-ele/src/api/pay/app/index.ts +++ b/apps/web-ele/src/api/pay/app/index.ts @@ -20,21 +20,14 @@ export namespace PayAppApi { } /** 更新状态请求 */ - export interface UpdateStatusReq { + export interface AppUpdateStatusReqVO { id: number; status: number; } - - export interface AppPageReqVO extends PageParam { - name?: string; - appKey?: string; - status?: number; - createTime?: Date[]; - } } /** 查询支付应用列表 */ -export function getAppPage(params: PayAppApi.AppPageReqVO) { +export function getAppPage(params: PageParam) { return requestClient.get>('/pay/app/page', { params, }); @@ -56,7 +49,7 @@ export function updateApp(data: PayAppApi.App) { } /** 修改支付应用状态 */ -export function updateAppStatus(data: PayAppApi.UpdateStatusReq) { +export function updateAppStatus(data: PayAppApi.AppUpdateStatusReqVO) { return requestClient.put('/pay/app/update-status', data); } diff --git a/apps/web-ele/src/api/pay/channel/index.ts b/apps/web-ele/src/api/pay/channel/index.ts index eb4c1d99e..99005024c 100644 --- a/apps/web-ele/src/api/pay/channel/index.ts +++ b/apps/web-ele/src/api/pay/channel/index.ts @@ -1,5 +1,3 @@ -import type { PageParam, PageResult } from '@vben/request'; - import { requestClient } from '#/api/request'; export namespace PayChannelApi { @@ -16,16 +14,6 @@ export namespace PayChannelApi { } } -/** 查询支付渠道列表 */ -export function getChannelPage(params: PageParam) { - return requestClient.get>( - '/pay/channel/page', - { - params, - }, - ); -} - /** 查询支付渠道详情 */ export function getChannel(appId: number, code: string) { return requestClient.get('/pay/channel/get', { @@ -42,13 +30,3 @@ export function createChannel(data: PayChannelApi.Channel) { export function updateChannel(data: PayChannelApi.Channel) { return requestClient.put('/pay/channel/update', data); } - -/** 删除支付渠道 */ -export function deleteChannel(id: number) { - return requestClient.delete(`/pay/channel/delete?id=${id}`); -} - -/** 导出支付渠道 */ -export function exportChannel(params: PageParam) { - return requestClient.download('/pay/channel/export-excel', { params }); -} diff --git a/apps/web-ele/src/api/pay/demo/order/index.ts b/apps/web-ele/src/api/pay/demo/order/index.ts index 262351059..0fb178888 100644 --- a/apps/web-ele/src/api/pay/demo/order/index.ts +++ b/apps/web-ele/src/api/pay/demo/order/index.ts @@ -19,11 +19,6 @@ export namespace DemoOrderApi { spuId?: number; createTime?: Date; } - - export interface OrderPageReqVO extends PageParam { - spuId?: number; - createTime?: Date[]; - } } /** 创建示例订单 */ @@ -32,7 +27,7 @@ export function createDemoOrder(data: DemoOrderApi.Order) { } /** 获得示例订单分页 */ -export function getDemoOrderPage(params: DemoOrderApi.OrderPageReqVO) { +export function getDemoOrderPage(params: PageParam) { return requestClient.get>( '/pay/demo-order/page', { diff --git a/apps/web-ele/src/api/pay/notify/index.ts b/apps/web-ele/src/api/pay/notify/index.ts index fe18ac03b..c4fb7b209 100644 --- a/apps/web-ele/src/api/pay/notify/index.ts +++ b/apps/web-ele/src/api/pay/notify/index.ts @@ -22,18 +22,6 @@ export namespace PayNotifyApi { updateTime: Date; logs?: any[]; } - - /** 支付通知任务分页请求 */ - export interface NotifyTaskPageReqVO extends PageParam { - appId?: number; - type?: number; - dataId?: number; - status?: number; - merchantOrderId?: string; - merchantRefundId?: string; - merchantTransferId?: string; - createTime?: Date[]; - } } /** 获得支付通知明细 */ @@ -42,7 +30,7 @@ export function getNotifyTaskDetail(id: number) { } /** 获得支付通知分页 */ -export function getNotifyTaskPage(params: PayNotifyApi.NotifyTaskPageReqVO) { +export function getNotifyTaskPage(params: PageParam) { return requestClient.get>( '/pay/notify/page', { diff --git a/apps/web-ele/src/api/pay/order/index.ts b/apps/web-ele/src/api/pay/order/index.ts index 445549192..0d4cdbf81 100644 --- a/apps/web-ele/src/api/pay/order/index.ts +++ b/apps/web-ele/src/api/pay/order/index.ts @@ -38,21 +38,10 @@ export namespace PayOrderApi { createTime: Date; updateTime: Date; } - - /** 支付订单分页请求 */ - export interface OrderPageReqVO extends PageParam { - appId?: number; - channelCode?: string; - merchantOrderId?: string; - channelOrderNo?: string; - no?: string; - status?: number; - createTime?: Date[]; - } } /** 查询支付订单列表 */ -export function getOrderPage(params: PayOrderApi.OrderPageReqVO) { +export function getOrderPage(params: PageParam) { return requestClient.get>('/pay/order/page', { params, }); diff --git a/apps/web-ele/src/api/pay/refund/index.ts b/apps/web-ele/src/api/pay/refund/index.ts index bce2448bc..a63af4389 100644 --- a/apps/web-ele/src/api/pay/refund/index.ts +++ b/apps/web-ele/src/api/pay/refund/index.ts @@ -36,39 +36,10 @@ export namespace PayRefundApi { createTime: Date; updateTime: Date; } - - /** 退款订单分页请求 */ - export interface RefundPageReqVO 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 function getRefundPage(params: PayRefundApi.RefundPageReqVO) { +export function getRefundPage(params: PageParam) { return requestClient.get>( '/pay/refund/page', { diff --git a/apps/web-ele/src/api/pay/transfer/index.ts b/apps/web-ele/src/api/pay/transfer/index.ts index 75cd21153..280ad4ddc 100644 --- a/apps/web-ele/src/api/pay/transfer/index.ts +++ b/apps/web-ele/src/api/pay/transfer/index.ts @@ -25,23 +25,10 @@ export namespace PayTransferApi { notifyUrl: string; channelNotifyData: string; } - - /** 转账单分页请求 */ - export interface TransferPageReqVO extends PageParam { - no?: string; - appId?: number; - channelCode?: string; - merchantOrderId?: string; - status?: number; - userName?: string; - userAccount?: string; - channelTransferNo?: string; - createTime?: Date[]; - } } /** 查询转账单列表 */ -export function getTransferPage(params: PayTransferApi.TransferPageReqVO) { +export function getTransferPage(params: PageParam) { return requestClient.get>( '/pay/transfer/page', { diff --git a/apps/web-ele/src/api/pay/wallet/balance/index.ts b/apps/web-ele/src/api/pay/wallet/balance/index.ts index fc061d6d8..052a6ec95 100644 --- a/apps/web-ele/src/api/pay/wallet/balance/index.ts +++ b/apps/web-ele/src/api/pay/wallet/balance/index.ts @@ -3,11 +3,6 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace PayWalletApi { - /** 用户钱包查询参数 */ - export interface PayWalletUserReq { - userId: number; - } - /** 钱包信息 */ export interface Wallet { id: number; @@ -19,32 +14,27 @@ export namespace PayWalletApi { freezePrice: number; } - /** 钱包分页请求 */ - export interface WalletPageReqVO extends PageParam { - userId?: number; - userType?: number; - balance?: number; - totalExpense?: number; - totalRecharge?: number; - freezePrice?: number; + /** 钱包查询参数 */ + export interface WalletUserQueryReqVO { + userId: number; } /** 钱包修改余额 */ - export interface PayWalletUpdateBalanceReqVO { + export interface WalletUpdateBalanceReqVO { userId: number; balance: number; } } /** 查询用户钱包详情 */ -export function getWallet(params: PayWalletApi.PayWalletUserReq) { +export function getWallet(params: PayWalletApi.WalletUserQueryReqVO) { return requestClient.get('/pay/wallet/get', { params, }); } /** 查询会员钱包列表 */ -export function getWalletPage(params: PayWalletApi.WalletPageReqVO) { +export function getWalletPage(params: PageParam) { return requestClient.get>( '/pay/wallet/page', { @@ -55,7 +45,7 @@ export function getWalletPage(params: PayWalletApi.WalletPageReqVO) { /** 修改会员钱包余额 */ export function updateWalletBalance( - data: PayWalletApi.PayWalletUpdateBalanceReqVO, + data: PayWalletApi.WalletUpdateBalanceReqVO, ) { return requestClient.put('/pay/wallet/update-balance', data); }