From a40ccca2bc64885b4213a3dd971eebaa01d7eb89 Mon Sep 17 00:00:00 2001 From: bootx Date: Sat, 20 Jul 2024 19:25:12 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/design/components/vxeTable.less | 9 - .../daxpay/admin/order/pay/PayOrder.api.ts | 127 +++++++ .../daxpay/admin/order/pay/PayOrderInfo.vue | 118 +++++++ .../daxpay/admin/order/pay/PayOrderList.vue | 318 ++++++++++++++++++ .../admin/order/refund/RefundOrder.api.ts | 127 +++++++ .../admin/order/refund/RefundOrderInfo.vue | 11 + 6 files changed, 701 insertions(+), 9 deletions(-) create mode 100644 src/views/daxpay/admin/order/pay/PayOrder.api.ts create mode 100644 src/views/daxpay/admin/order/pay/PayOrderInfo.vue create mode 100644 src/views/daxpay/admin/order/pay/PayOrderList.vue create mode 100644 src/views/daxpay/admin/order/refund/RefundOrder.api.ts create mode 100644 src/views/daxpay/admin/order/refund/RefundOrderInfo.vue diff --git a/src/design/components/vxeTable.less b/src/design/components/vxeTable.less index b1835b697..793fcb8d6 100644 --- a/src/design/components/vxeTable.less +++ b/src/design/components/vxeTable.less @@ -2,15 +2,6 @@ .vxe-modal--wrapper{ // 层级与保持antdv一致 z-index: 1000 !important; - .vxe-modal--box{ - .vxe-modal--footer{ - padding: .8em 1em; - border-top: 1px solid #ebeef5; - .ant-btn{ - margin-left: 10px; - } - } - } } // vxe表格相关 .vxe-custom--option-wrapper{ diff --git a/src/views/daxpay/admin/order/pay/PayOrder.api.ts b/src/views/daxpay/admin/order/pay/PayOrder.api.ts new file mode 100644 index 000000000..f061cde17 --- /dev/null +++ b/src/views/daxpay/admin/order/pay/PayOrder.api.ts @@ -0,0 +1,127 @@ +import { defHttp } from '@/utils/http/axios' +import { PageResult, Result } from '#/axios' +import { MchEntity } from '#/web' + +/** + * 分页 + */ +export function page(params) { + return defHttp.get>>({ + url: '/order/pay/page', + params, + }) +} + +/** + * 获取订单 + */ +export function getOrder(id: number) { + return defHttp.get>({ + url: '/order/pay/findById', + params: { id }, + }) +} + +/** + * 根据订单号查询详情 + */ +export function getOrderByOrderNo(orderNo: string) { + return defHttp.get({ + url: '/order/pay/findByOrderNo', + params: { orderNo }, + }) +} + +/** + * 根据订单号同步支付状态 + */ +export function syncByOrderNo(orderNo: string) { + return defHttp.post({ + url: '/order/pay/syncByOrderNo', + params: { orderNo }, + }) +} + +/** + * 关闭支付记录 + */ +export function close(orderNo) { + return defHttp.post>({ + url: '/order/pay/close', + params: { orderNo }, + }) +} + +/** + * 触发分账 + */ +export function allocationByOrderNo(orderNo) { + return defHttp.post>({ + url: '/order/pay/allocation', + params: { orderNo }, + }) +} + +/** + * 获取汇总金额 + */ +export function getTotalAmount(param) { + return defHttp.get>({ + url: '/order/pay/getTotalAmount', + params: param, + }) +} + +/** + * 支付记录 + */ +export interface PayOrder extends MchEntity { + // 标题 + title?: string + // 商户订单号 + bizOrderNo?: string + // 支付订单号 + orderNo?: string + // 三方系统交易号 + outOrderNo?: string + // 描述 + description?: any + // 是否支持分账 + allocation?: boolean + // 自动分账 + autoAllocation?: boolean + // 支付通道 + channel?: string + // 支付方式 + method?: string + // 金额 + amount?: number + // 可退款余额 + refundableBalance?: number + // 支付状态 + status?: string + // 退款状态 + refundStatus?: string + // 分账状态 + allocStatus?: string + // 支付时间 + payTime?: string + // 过期时间 + expiredTime?: string + // 关闭时间 + closeTime?: string + // 异步通知地址 + notifyUrl?: string + // 商户扩展参数 + attach?: string + // 附加参数 + extraParam?: string + // 请求时间 + reqTime?: string + // 支付终端ip + clientIp?: string + // 错误码 + errorCode?: string + // 错误信息 + errorMsg?: string +} diff --git a/src/views/daxpay/admin/order/pay/PayOrderInfo.vue b/src/views/daxpay/admin/order/pay/PayOrderInfo.vue new file mode 100644 index 000000000..46f2d2e38 --- /dev/null +++ b/src/views/daxpay/admin/order/pay/PayOrderInfo.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/daxpay/admin/order/pay/PayOrderList.vue b/src/views/daxpay/admin/order/pay/PayOrderList.vue new file mode 100644 index 000000000..13f7791bd --- /dev/null +++ b/src/views/daxpay/admin/order/pay/PayOrderList.vue @@ -0,0 +1,318 @@ + + + + + diff --git a/src/views/daxpay/admin/order/refund/RefundOrder.api.ts b/src/views/daxpay/admin/order/refund/RefundOrder.api.ts new file mode 100644 index 000000000..261f9e8d2 --- /dev/null +++ b/src/views/daxpay/admin/order/refund/RefundOrder.api.ts @@ -0,0 +1,127 @@ +import { defHttp } from '@/utils/http/axios' +import { PageResult, Result } from '#/axios' +import {BaseEntity, MchEntity} from '#/web' + +/** + * 分页 + */ +export function page(params) { + return defHttp.get>>({ + url: '/order/pay/page', + params, + }) +} + +/** + * 获取订单 + */ +export function getOrder(id: number) { + return defHttp.get>({ + url: '/order/pay/findById', + params: { id }, + }) +} + +/** + * 获取订单 + */ +export function getOrderByOrderNo(orderNo: string) { + return defHttp.get({ + url: '/order/pay/findByOrderNo', + params: { orderNo }, + }) +} + +/** + * 根据订单号同步支付状态 + */ +export function syncByOrderNo(orderNo: string) { + return defHttp.post({ + url: '/order/pay/syncByOrderNo', + params: { orderNo }, + }) +} + +/** + * 关闭支付记录 + */ +export function close(orderNo) { + return defHttp.post>({ + url: '/order/pay/close', + params: { orderNo }, + }) +} + +/** + * 触发分账 + */ +export function allocationByOrderNo(orderNo) { + return defHttp.post>({ + url: '/order/pay/allocation', + params: { orderNo }, + }) +} + +/** + * 获取汇总金额 + */ +export function getTotalAmount(param) { + return defHttp.get>({ + url: '/order/pay/getTotalAmount', + params: param, + }) +} + +/** + * 支付记录 + */ +export interface PayOrder extends MchEntity { + // 标题 + title?: string + // 商户订单号 + bizOrderNo?: string + // 支付订单号 + orderNo?: string + // 三方系统交易号 + outOrderNo?: string + // 描述 + description?: any + // 是否支持分账 + allocation?: boolean + // 自动分账 + autoAllocation?: boolean + // 支付通道 + channel?: string + // 支付方式 + method?: string + // 金额 + amount?: number + // 可退款余额 + refundableBalance?: number + // 支付状态 + status?: string + // 退款状态 + refundStatus?: string + // 分账状态 + allocStatus?: string + // 支付时间 + payTime?: string + // 过期时间 + expiredTime?: string + // 关闭时间 + closeTime?: string + // 异步通知地址 + notifyUrl?: string + // 商户扩展参数 + attach?: string + // 附加参数 + extraParam?: string + // 请求时间 + reqTime?: string + // 支付终端ip + clientIp?: string + // 错误码 + errorCode?: string + // 错误信息 + errorMsg?: string +} diff --git a/src/views/daxpay/admin/order/refund/RefundOrderInfo.vue b/src/views/daxpay/admin/order/refund/RefundOrderInfo.vue new file mode 100644 index 000000000..0a8d203dd --- /dev/null +++ b/src/views/daxpay/admin/order/refund/RefundOrderInfo.vue @@ -0,0 +1,11 @@ + + + + +