diff --git a/src/enums/payment/PayStatus.ts b/src/enums/payment/PayStatus.ts index 41ca6f249..c73ec08f8 100644 --- a/src/enums/payment/PayStatus.ts +++ b/src/enums/payment/PayStatus.ts @@ -8,9 +8,6 @@ export enum PayStatus { /** 成功 */ SUCCESS = 'success', - /** 失败 */ - FAIL = 'fail', - /** 支付关闭(超时/手动取消/订单已经关闭撤销支付单) */ CANCEL = 'close', @@ -19,4 +16,7 @@ export enum PayStatus { /** 全部退款 */ REFUNDED = 'refunded', + + /** 失败 */ + FAIL = 'fail', } diff --git a/src/enums/payment/PaySyncStatusEnum.ts b/src/enums/payment/PaySyncStatusEnum.ts new file mode 100644 index 000000000..ccdbebb0c --- /dev/null +++ b/src/enums/payment/PaySyncStatusEnum.ts @@ -0,0 +1,17 @@ +/** + * 支付同步状态 + */ +export enum PaySyncStatus { + // 支付查询失败 + FAIL = 'fail', + // 支付成功 + SUCCESS = 'success', + // 支付中 + PROGRESS = 'progress', + // 支付已关闭 + CLOSED = 'closed', + // 支付退款 + REFUND = 'refund', + // 交易不存在 + NOT_FOUND = 'not_found', +} diff --git a/src/enums/payment/RefundStatusEnum.ts b/src/enums/payment/RefundStatusEnum.ts new file mode 100644 index 000000000..5fe2ecfb2 --- /dev/null +++ b/src/enums/payment/RefundStatusEnum.ts @@ -0,0 +1,13 @@ +/** + * 退款状态枚举 + */ +export enum RefundStatus { + // 退款中 + PROGRESS = 'progress', + // 成功 + SUCCESS = 'success', + // 关闭 + CLOSE = 'close', + // 失败 + FAIL = 'fail', +} diff --git a/src/enums/payment/RefundSyncStatusEnum.ts b/src/enums/payment/RefundSyncStatusEnum.ts new file mode 100644 index 000000000..23c1cffbb --- /dev/null +++ b/src/enums/payment/RefundSyncStatusEnum.ts @@ -0,0 +1,13 @@ +/** + * 退款同步状态枚举 + */ +export enum RefundSyncStatus { + //退款成功 + SUCCESS = 'refund_success', + //退款失败 + FAIL = 'refund_fail', + //退款中 + PROGRESS = 'refund_progress', + //交易不存在 + NOT_FOUND = 'pay_not_found', +} diff --git a/src/enums/payment/payChannelEnum.ts b/src/enums/payment/payChannelEnum.ts index d169d0dfa..06b797d7f 100644 --- a/src/enums/payment/payChannelEnum.ts +++ b/src/enums/payment/payChannelEnum.ts @@ -6,6 +6,5 @@ export enum payChannelEnum { WECHAT = 'wechat_pay', UNION_PAY = 'union_pay', WALLET = 'wallet_pay', - CREDIT_CARD = 'credit_pay', AGGREGATION = 'aggregation_pay', } diff --git a/src/enums/payment/voucherEnum.ts b/src/enums/payment/voucherEnum.ts deleted file mode 100644 index 9b263864f..000000000 --- a/src/enums/payment/voucherEnum.ts +++ /dev/null @@ -1,43 +0,0 @@ -/** - * 储值卡常量 - */ -export enum VoucherEnum { - /** - * 状态-正常 - */ - STATUS_NORMAL = 'normal', - - /** - * 状态-停用 - */ - STATUS_FORBIDDEN = 'forbidden', - - /** - * 储值卡日志-开通 - */ - LOG_ACTIVE = 'active', - - /** - * 储值卡日志-预冻结额度 - */ - LOG_FREEZE_BALANCE = 'freeze', - - /** - * 储值卡日志-扣减并解冻余额 - */ - LOG_REDUCE_AND_UNFREEZE_BALANCE = 'reduceAndUnfreeze', - - /** - * 储值卡日志-直接支付 - */ - LOG_PAY = 'pay', - /** - * 储值卡日志-取消支付 - */ - LOG_CLOSE_PAY = 'closePay', - - /** - * 储值卡日志-退款到本卡中 - */ - LOG_REFUND_SELF = 'refundSelf', -} diff --git a/src/enums/payment/walletEnum.ts b/src/enums/payment/walletEnum.ts deleted file mode 100644 index d857537f6..000000000 --- a/src/enums/payment/walletEnum.ts +++ /dev/null @@ -1,77 +0,0 @@ -/** - * 钱包枚举 - */ -export enum WalletEnum { - /** 钱包状态-正常 */ - NORMAL = 'normal', - - /** 钱包状态-禁用 */ - FORBIDDEN = 'forbidden', -} -/** - * 钱包日志枚举 - */ -export enum WalletLogEnum { - /** - * 钱包日志-开通 - */ - ACTIVE = 'active', - - /** - * 钱包日志-Admin操作余额变动 - */ - ADMIN_CHANGER = 'adminChanger', - - /** - * 钱包日志-预冻结额度 - */ - FREEZE_BALANCE = 'freeze', - - /** - * 钱包日志-解冻额度 - */ - UNFREEZE_BALANCE = 'unfreeze', - - /** - * 钱包日志-解冻并扣减余额 - */ - REDUCE_AND_UNFREEZE_BALANCE = 'reduceAndUnfreeze', - - /** - * 钱包日志-直接支付 - */ - PAY = 'pay', - /** - * 钱包日志-取消支付 - */ - CLOSE_PAY = 'closePay', - - /** - * 钱包日志-退款 - */ - REFUND = 'refund', - - /** - * 锁定钱包 - */ - LOCK = 'lock', - - /** - * 解锁钱包 - */ - UNLOCK = 'unlock', -} - -/** - * 操作类型 - */ -export enum WalletOperationEnum { - /** 系统操作 */ - SOURCE_SYSTEM = 'system', - - /** 管理员操作 */ - SOURCE_ADMIN = 'admin', - - /** 用户操作 */ - SOURCE_USER = 'user', -} diff --git a/src/views/demo/cashier/Cashier.api.ts b/src/views/demo/cashier/Cashier.api.ts index 147dce124..346871357 100644 --- a/src/views/demo/cashier/Cashier.api.ts +++ b/src/views/demo/cashier/Cashier.api.ts @@ -15,10 +15,10 @@ export function simplePayCashier(obj) { /** * 根据业务ID获取支付状态 */ -export function findStatusByBusinessId(businessNo) { +export function findStatusByBizOrderNoeNo(bizOrderNoeNo) { return defHttp.get>({ url: '/demo/cashier/queryPayOrderSuccess', - params: { businessNo }, + params: { businessNo: bizOrderNoeNo }, }) } @@ -56,12 +56,12 @@ export function aggregateBarCodePay(obj) { * 发起支付后响应对象 */ export interface PayOrderResult { - // 支付ID - paymentId: string - // 是否是异步支付 - asyncPay: boolean - // 异步支付通道 - asyncChannel: string + // 商户订单号 + bizOrderNo: string + // 订单号 + orderNo: string + // 支付状态 + status: string // 支付参数体(通常用于发起异步支付的参数) payBody: string } diff --git a/src/views/demo/cashier/Cashier.vue b/src/views/demo/cashier/Cashier.vue index 4b838dec3..bcb3c652d 100644 --- a/src/views/demo/cashier/Cashier.vue +++ b/src/views/demo/cashier/Cashier.vue @@ -140,7 +140,7 @@