feat 支付对账

This commit is contained in:
bootx
2024-01-21 23:10:04 +08:00
parent fe197e8ea3
commit 5e17bccfd6
6 changed files with 73 additions and 12 deletions

View File

@@ -1,7 +1,7 @@
import { defHttp } from '/@/utils/http/axios'
import { PageResult, Result } from '/#/axios'
import { BaseEntity } from '/#/web'
import { RefundableInfo } from '/@/views/payment/order/refund/RefundRecord.api'
import { RefundableInfo } from '/src/views/payment/order/refund/RefundOrder.api'
import { PaySyncResult } from "/@/views/payment/record/sync/PaySyncRecord.api";
/**

View File

@@ -32,7 +32,7 @@
import { $ref } from 'vue/macros'
import useFormEdit from '/@/hooks/bootx/useFormEdit'
import { useDict } from '/@/hooks/bootx/useDict'
import { refund, RefundableInfo } from '../refund/RefundRecord.api'
import { refund, RefundableInfo } from '../refund/RefundOrder.api'
import BasicModal from '/@/components/Modal/src/BasicModal.vue'
import { FormInstance } from 'ant-design-vue/lib/form'
import { useMessage } from '/@/hooks/web/useMessage'

View File

@@ -0,0 +1,61 @@
import { defHttp } from '/@/utils/http/axios'
import { PageResult, Result } from '/#/axios'
import { BaseEntity } from '/#/web'
/**
* 分页
*/
export function page(params: any) {
return defHttp.get<PageResult<ReconcileOrder>>({
url: '/reconcile/page',
params,
})
}
/**
* 查看单条
*/
export function get(id: string) {
return defHttp.get<ReconcileOrder>({
url: '/reconcile/get',
params: { id },
})
}
/**
* 支付对账订单
*/
export interface ReconcileOrder extends BaseEntity {
// 批次号
batchNo?: string
// 日期
date?: string
// 通道
channel?: string
// 是否下载成功
down?: boolean
// 是否比对完成
compare?: boolean
// 错误信息
errorMsg?: string
}
/**
* 通用支付对账记录
*/
export interface ReconcileDetail extends BaseEntity {
// 关联对账订单ID
recordOrderId?: string
// 交易状态
status?: string
// 交易类型
type?: string
// 订单id
orderId?: string
// 网关订单号
gatewayOrderNo?: string
// 交易金额
amount?: string
// 商品名称
title?: string
}

View File

@@ -6,7 +6,7 @@ import { BaseEntity } from '/#/web'
*
*/
export function page(params) {
return defHttp.get<Result<PageResult<RefundRecord>>>({
return defHttp.get<Result<PageResult<RefundOrder>>>({
url: '/order/refund/page',
params,
})
@@ -16,7 +16,7 @@ export function page(params) {
*
*/
export function get(paymentId) {
return defHttp.get<Result<RefundRecord>>({
return defHttp.get<Result<RefundOrder>>({
url: '/order/refund/findById',
params: { paymentId },
})
@@ -35,7 +35,7 @@ export function refund(params) {
/**
* 退
*/
export interface RefundRecord extends BaseEntity {
export interface RefundOrder extends BaseEntity {
// 原支付记录id
paymentId?: string
// 原业务号

View File

@@ -56,7 +56,7 @@
<script lang="ts" setup>
import { $ref } from 'vue/macros'
import useFormEdit from '/@/hooks/bootx/useFormEdit'
import { get, RefundRecord } from './RefundRecord.api'
import { get, RefundOrder } from './RefundOrder.api'
import { FormInstance } from 'ant-design-vue/lib/form'
import { BasicModal } from '/@/components/Modal'
import { useDict } from '/@/hooks/bootx/useDict'
@@ -77,7 +77,7 @@
const { dictConvert } = useDict()
//
const formRef = $ref<FormInstance>()
let form = $ref<RefundRecord>({})
let form = $ref<RefundOrder>({})
//
const emits = defineEmits(['ok'])

View File

@@ -49,7 +49,7 @@
:total="pagination.total"
@page-change="handleTableChange"
/>
<refund-record-info ref="refundRecordInfo" @ok="queryPage" />
<refund-order-info ref="refundOrderInfo" @ok="queryPage" />
<pay-order-info ref="payOrderInfo" />
</div>
</div>
@@ -58,9 +58,9 @@
<script lang="ts" setup>
import { computed, onMounted } from 'vue'
import { $ref } from 'vue/macros'
import { page } from './RefundRecord.api'
import { page } from './RefundOrder.api'
import useTablePage from '/@/hooks/bootx/useTablePage'
import RefundRecordInfo from './RefundRecordInfo.vue'
import RefundOrderInfo from './RefundOrderInfo.vue'
import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
import BQuery from '/@/components/Bootx/Query/BQuery.vue'
import { useMessage } from '/@/hooks/web/useMessage'
@@ -98,7 +98,7 @@
const xTable = $ref<VxeTableInstance>()
const xToolbar = $ref<VxeToolbarInstance>()
const refundRecordInfo = $ref<any>()
const refundOrderInfo = $ref<any>()
const payOrderInfo = $ref<any>()
onMounted(() => {
@@ -135,7 +135,7 @@
* 查看
*/
function show(record) {
refundRecordInfo.init(record.id)
refundOrderInfo.init(record.id)
}
/**