diff --git a/src/enums/daxpay/ChannelEnum.ts b/src/enums/daxpay/ChannelEnum.ts deleted file mode 100644 index 07403ff3a..000000000 --- a/src/enums/daxpay/ChannelEnum.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * 支付通道 - */ -export enum ChannelEnum { - ALI = 'ali_pay', - WECHAT = 'wechat_pay', - UNION_PAY = 'union_pay', -} diff --git a/src/enums/daxpay/PaymentEnum.ts b/src/enums/daxpay/PaymentEnum.ts new file mode 100644 index 000000000..192077b50 --- /dev/null +++ b/src/enums/daxpay/PaymentEnum.ts @@ -0,0 +1,26 @@ +/** + * 支付通道 + */ +export enum PaymentEnum { + ALI = 'ali_pay', + WECHAT = 'wechat_pay', + UNION_PAY = 'union_pay', +} + +/** + * 交易类型 + */ +export enum TradeTypeEnum { + /** + * 支付 + */ + PAY = 'pay', + /** + * 退款 + */ + REFUND = 'refund', + /** + * 转账 + */ + TRANSFER = 'transfer', +} diff --git a/src/enums/daxpay/TradeStatusEnum.ts b/src/enums/daxpay/TradeStatusEnum.ts index 022efc970..1dc0ef735 100644 --- a/src/enums/daxpay/TradeStatusEnum.ts +++ b/src/enums/daxpay/TradeStatusEnum.ts @@ -1,7 +1,7 @@ /** * 支付状态 */ -export enum PayStatusEnum{ +export enum PayStatusEnum { /** * 支付中 */ @@ -31,7 +31,7 @@ export enum PayStatusEnum{ /** * 支付订单的退款状态 */ -export enum PayRefundStatusEnum{ +export enum PayRefundStatusEnum { /** * 未退款 */ @@ -53,8 +53,7 @@ export enum PayRefundStatusEnum{ /** * 支付订单的分账状态 */ -export enum PayAllocStatusEnum{ - +export enum PayAllocStatusEnum { /** * 待分账 */ @@ -68,7 +67,7 @@ export enum PayAllocStatusEnum{ /** * 退款状态枚举 */ -export enum RefundStatusEnum{ +export enum RefundStatusEnum { /** * 退款中 */ @@ -90,7 +89,7 @@ export enum RefundStatusEnum{ /** * 转账状态 */ -export enum TransferStatusEnum{ +export enum TransferStatusEnum { /** 转账中 */ PROGRESS = 'progress', /** 转账成功 */ diff --git a/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue b/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue index de0177ecb..a4940d6dc 100644 --- a/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue +++ b/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue @@ -4,7 +4,7 @@ + + diff --git a/src/views/daxpay/admin/record/sync/TradeSyncRecordList.vue b/src/views/daxpay/admin/record/sync/TradeSyncRecordList.vue new file mode 100644 index 000000000..fc4b65a67 --- /dev/null +++ b/src/views/daxpay/admin/record/sync/TradeSyncRecordList.vue @@ -0,0 +1,191 @@ + + + + +