diff --git a/src/enums/daxpay/TradeStatusEnum.ts b/src/enums/daxpay/TradeStatusEnum.ts index 1dc0ef735..42bcd9bf5 100644 --- a/src/enums/daxpay/TradeStatusEnum.ts +++ b/src/enums/daxpay/TradeStatusEnum.ts @@ -94,8 +94,24 @@ export enum TransferStatusEnum { PROGRESS = 'progress', /** 转账成功 */ SUCCESS = 'success', - /** 转账关闭 */ - FAIL = 'fail', /** 转账失败 */ + FAIL = 'fail', + /** 转账关闭 */ CLOSE = 'close', } + +/** + * 支付回调处理状态 + */ +export enum CallbackStatusEnum { + /** 成功 */ + SUCCESS = 'success', + /** 失败 */ + FAIL = 'fail', + /** 忽略 */ + IGNORE = 'ignore', + /** 异常 */ + EXCEPTION = 'exception', + /** 未找到 */ + NOT_FOUND = 'not_found', +} diff --git a/src/views/daxpay/admin/order/pay/PayOrderInfo.vue b/src/views/daxpay/admin/order/pay/PayOrderInfo.vue index 3481bb6cc..a9ab70e26 100644 --- a/src/views/daxpay/admin/order/pay/PayOrderInfo.vue +++ b/src/views/daxpay/admin/order/pay/PayOrderInfo.vue @@ -49,7 +49,7 @@ {{ order.errorMsg || '无' }} - + {{ order.clientIp }} diff --git a/src/views/daxpay/admin/order/refund/RefundOrder.api.ts b/src/views/daxpay/admin/order/refund/RefundOrder.api.ts index 67d94cdd7..6b3251a36 100644 --- a/src/views/daxpay/admin/order/refund/RefundOrder.api.ts +++ b/src/views/daxpay/admin/order/refund/RefundOrder.api.ts @@ -1,6 +1,12 @@ import { defHttp } from '@/utils/http/axios' import { PageResult, Result } from '#/axios' import { MchEntity } from '#/web' +import { + PayAllocStatusEnum, + PayRefundStatusEnum, + PayStatusEnum, + RefundStatusEnum, +} from '@/enums/daxpay/TradeStatusEnum' /** * 分页 @@ -82,6 +88,27 @@ export function getTotalAmount(param) { }) } +/** + * 显示样式优化 + */ +export function cellStyle({ row, column }) { + // 支付状态 + if (column.field == 'status') { + if (row.status == RefundStatusEnum.SUCCESS) { + return { color: 'green' } + } + if (row.status == RefundStatusEnum.FAIL) { + return { color: 'red' } + } + if (row.status == RefundStatusEnum.PROGRESS) { + return { color: 'orange' } + } + if (row.status == RefundStatusEnum.CLOSE) { + return { color: 'gray' } + } + } +} + /** * 退款记录 */ diff --git a/src/views/daxpay/admin/order/refund/RefundOrderList.vue b/src/views/daxpay/admin/order/refund/RefundOrderList.vue index 92748f63d..eec1304d0 100644 --- a/src/views/daxpay/admin/order/refund/RefundOrderList.vue +++ b/src/views/daxpay/admin/order/refund/RefundOrderList.vue @@ -54,7 +54,7 @@ {{ row.amount ? row.amount : 0 }} - + @@ -107,7 +107,14 @@ diff --git a/src/views/daxpay/admin/order/transfer/TransferOrder.api.ts b/src/views/daxpay/admin/order/transfer/TransferOrder.api.ts index 976aa7f6e..06a8e8636 100644 --- a/src/views/daxpay/admin/order/transfer/TransferOrder.api.ts +++ b/src/views/daxpay/admin/order/transfer/TransferOrder.api.ts @@ -1,6 +1,7 @@ import { defHttp } from '@/utils/http/axios' import { PageResult, Result } from '#/axios' -import { BaseEntity } from '#/web' +import { MchEntity} from '#/web' +import { TransferStatusEnum } from '@/enums/daxpay/TradeStatusEnum' /** * 分页 @@ -45,19 +46,29 @@ export function transfer(params) { /** * 转账信息同步 */ -export function syncByTransferNo(transferNo) { +export function syncByTransferNo(id) { return defHttp.post>({ - url: '/order/transfer/syncByTransferNo', - params: { transferNo }, + url: '/order/transfer/sync', + params: { id }, }) } /** * 转账重试 */ -export function resetTransfer(id) { +export function retryTransfer(id) { return defHttp.post>({ - url: '/order/transfer/resetTransfer', + url: '/order/transfer/retry', + params: { id }, + }) +} + +/** + * 关闭转账订单 + */ +export function closeTransfer(id) { + return defHttp.post>({ + url: '/order/transfer/close', params: { id }, }) } @@ -72,10 +83,30 @@ export function getTotalAmount(param) { }) } +/** + * 显示样式优化 + */ +export function cellStyle({ row, column }) { + if (column.field == 'status') { + if (row.status == TransferStatusEnum.SUCCESS) { + return { color: 'green' } + } + if (row.status == TransferStatusEnum.FAIL) { + return { color: 'red' } + } + if (row.status == TransferStatusEnum.PROGRESS) { + return { color: 'orange' } + } + if (row.status == TransferStatusEnum.CLOSE) { + return { color: 'gray' } + } + } +} + /** * 转账记录 */ -export interface TransferOrder extends BaseEntity { +export interface TransferOrder extends MchEntity { // 商户转账号 bizTransferNo?: string // 转账号 @@ -100,8 +131,8 @@ export interface TransferOrder extends BaseEntity { payeeName?: string // 状态 status?: string - // 成功时间 - successTime?: string + // 完成时间 + finishTime?: string // 异步通知地址 notifyUrl?: string // 商户扩展参数 diff --git a/src/views/daxpay/admin/order/transfer/TransferOrderInfo.vue b/src/views/daxpay/admin/order/transfer/TransferOrderInfo.vue index 56caf1412..b601da49c 100644 --- a/src/views/daxpay/admin/order/transfer/TransferOrderInfo.vue +++ b/src/views/daxpay/admin/order/transfer/TransferOrderInfo.vue @@ -33,17 +33,17 @@ {{ order.payeeName || '空' }} - + {{ order.payeeAccount }} {{ dictConvert('transfer_status', order.status) || '空' }} - + {{ order.createTime }} - {{ order.successTime }} + {{ order.finishTime }} {{ order.errorCode }} @@ -51,9 +51,18 @@ {{ order.errorMsg }} - + {{ order.clientIp }} + + {{ order.mchNo }} + + + {{ order.appId }} + + + {{ order.attach || '无' }} +