From f6b7a69230dad6015bb2057ab25aadaa13c818cc Mon Sep 17 00:00:00 2001 From: bootx Date: Tue, 17 Sep 2024 21:44:39 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=BC=80=E5=8F=91=E8=80=85=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daxpay/{PaymentEnum.ts => ChannelEnum.ts} | 2 +- .../daxpay/common/develop/DevelopTrade.api.ts | 199 +++++++++++++++++- .../daxpay/common/develop/DevelopTrade.vue | 43 ++++ .../daxpay/common/develop/DevelopTradePay.vue | 134 ++++++++++++ .../common/develop/DevelopTradeRefund.vue | 11 + .../common/develop/DevelopTradeTransfer.vue | 11 + .../merchant/channel/ChannelConfigEdit.vue | 8 +- .../merchant/channel/ChannelConfigList.vue | 8 +- .../common/notice/notify/NotifyTaskList.vue | 2 +- .../discrepancy/ReconcileDiscrepancyList.vue | 2 +- .../callback/TradeCallbackRecordList.vue | 2 +- .../record/flow/TradeFlowRecordList.vue | 2 +- .../record/sync/TradeSyncRecordList.vue | 2 +- 13 files changed, 409 insertions(+), 17 deletions(-) rename src/enums/daxpay/{PaymentEnum.ts => ChannelEnum.ts} (95%) create mode 100644 src/views/daxpay/common/develop/DevelopTrade.vue create mode 100644 src/views/daxpay/common/develop/DevelopTradePay.vue create mode 100644 src/views/daxpay/common/develop/DevelopTradeRefund.vue create mode 100644 src/views/daxpay/common/develop/DevelopTradeTransfer.vue diff --git a/src/enums/daxpay/PaymentEnum.ts b/src/enums/daxpay/ChannelEnum.ts similarity index 95% rename from src/enums/daxpay/PaymentEnum.ts rename to src/enums/daxpay/ChannelEnum.ts index 25728eef9..635361d76 100644 --- a/src/enums/daxpay/PaymentEnum.ts +++ b/src/enums/daxpay/ChannelEnum.ts @@ -1,7 +1,7 @@ /** * 支付通道 */ -export enum PaymentEnum { +export enum ChannelEnum { ALI = 'ali_pay', WECHAT = 'wechat_pay', UNION_PAY = 'union_pay', diff --git a/src/views/daxpay/common/develop/DevelopTrade.api.ts b/src/views/daxpay/common/develop/DevelopTrade.api.ts index e01b5c653..13d5d4c3d 100644 --- a/src/views/daxpay/common/develop/DevelopTrade.api.ts +++ b/src/views/daxpay/common/develop/DevelopTrade.api.ts @@ -1,20 +1,213 @@ import { defHttp } from '@/utils/http/axios' -import { PageResult, Result } from '#/axios' +import { Result } from '#/axios' + +/** + * 支付参数签名 + */ +export function paySign(param: PayParam) { + return defHttp.post>({ url: '/develop/trade/pay/sign', data: param }) +} /** * 支付 */ export function tradePay(params) { - return defHttp.post>({ url: '/develop/trade/pay', params }) + return defHttp.post>({ url: '/develop/trade/pay', data: params }) } +/** + * 退款参数签名 + */ +export function refundSign(param: RefundParam) { + return defHttp.post>({ url: '/develop/trade/refund/sign', data: param }) +} + +/** + * 退款 + */ +export function tradeRefund(params) { + return defHttp.post>({ url: '/develop/trade/refund', data: params }) +} + +/** + * 转账签名 + */ +export function transferSign(param: TransferParam) { + return defHttp.post>({ url: '/develop/trade/transfer/sign', data: param }) +} + +/** + * 转账 + */ +export function tradeTransfer(params) { + return defHttp.post>({ url: '/develop/trade/transfer', data: params }) +} + +/** + * 支付请求参数 + */ +export interface PayParam { + /** 商户订单号 */ + bizOrderNo?: string + /** 支付标题 */ + title?: string + /** 支付描述 */ + description?: string + /** 是否开启分账 */ + allocation?: boolean + /** 自动分账 */ + autoAllocation?: boolean + /** 过期时间 */ + expiredTime?: string + /** 支付通道编码 */ + channel?: string + /** 支付方式编码 */ + method?: string + /** 支付金额 */ + amount?: number + /** 支付扩展参数 */ + extraParam?: string + /** 商户扩展参数 */ + attach?: string + /** 同步跳转地址 */ + returnUrl?: string + /** 用户付款中途退出返回商户网站的地址 */ + quitUrl?: string + /** 异步通知地址 */ + notifyUrl?: string + /** 商户号 */ + mchNo?: string + /** 应用号 */ + appId?: string + /** 随机数 */ + nonceStr?: string + /** 签名 */ + sign?: string +} /** * 支付返回结果 */ export interface PayResult { + /** 商户订单号 */ + bizOrderNo?: string + /** 订单号 */ + orderNo?: string + /** 支付状态 */ + status?: string + /** 支付参数体 */ + payBody?: string + /** 商户号 */ + mchNo?: string + /** 应用号 */ + appId?: string + /** 随机数 */ + nonceStr?: string + /** 签名 */ + sign?: string } /** - * + * 退款请求参数 */ +export interface RefundParam { + /** 商户退款号 */ + bizRefundNo?: string + /** 支付订单号 */ + orderNo?: string + /** 商户订单号 */ + bizOrderNo?: string + /** 退款金额 */ + amount?: number + /** 退款原因 */ + reason?: string + /** 退款扩展参数 */ + extraParam?: string + /** 商户扩展参数 */ + attach?: string + /** 异步通知地址 */ + notifyUrl?: string + /** 商户号 */ + mchNo?: string + /** 应用号 */ + appId?: string + /** 随机数 */ + nonceStr?: string + /** 签名 */ + sign?: string +} + +/** + * 退款返回结果 + */ +export interface RefundResult { + /** 退款号 */ + refundNo?: string + /** 商户退款号 */ + bizRefundNo?: string + /** 退款状态 */ + status?: string + /** 商户号 */ + mchNo?: string + /** 应用号 */ + appId?: string + /** 随机数 */ + nonceStr?: string + /** 签名 */ + sign?: string +} + +/** + * 转账请求参数 + */ +export interface TransferParam { + /** 商户转账号 */ + bizTransferNo?: string + /** 支付通道 */ + channel?: string + /** 转账金额 */ + amount?: string + /** 标题 */ + title?: string + /** 转账原因 */ + reason?: string + /** 收款人账号类型 */ + payeeType?: string + /** 收款人账号 */ + payeeAccount?: string + /** 收款人姓名 */ + payeeName?: string + /** 商户扩展参数 */ + attach?: string + /** 异步通知地址 */ + notifyUrl?: string + /** 商户号 */ + mchNo?: string + /** 应用号 */ + appId?: string + /** 随机数 */ + nonceStr?: string + /** 签名 */ + sign?: string +} +/** + * 转账返回结果 + */ +export interface TransferResult { + /** 商户转账号 */ + bizTransferNo?: string + /** 转账号 */ + transferNo?: string + /** 状态 */ + status?: string + /** 提示信息 */ + errorMsg?: string + /** 商户号 */ + mchNo?: string + /** 应用号 */ + appId?: string + /** 随机数 */ + nonceStr?: string + /** 签名 */ + sign?: string +} diff --git a/src/views/daxpay/common/develop/DevelopTrade.vue b/src/views/daxpay/common/develop/DevelopTrade.vue new file mode 100644 index 000000000..ef899d8ac --- /dev/null +++ b/src/views/daxpay/common/develop/DevelopTrade.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/views/daxpay/common/develop/DevelopTradePay.vue b/src/views/daxpay/common/develop/DevelopTradePay.vue new file mode 100644 index 000000000..11e4c66bb --- /dev/null +++ b/src/views/daxpay/common/develop/DevelopTradePay.vue @@ -0,0 +1,134 @@ + + + + diff --git a/src/views/daxpay/common/develop/DevelopTradeRefund.vue b/src/views/daxpay/common/develop/DevelopTradeRefund.vue new file mode 100644 index 000000000..0a8d203dd --- /dev/null +++ b/src/views/daxpay/common/develop/DevelopTradeRefund.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/daxpay/common/develop/DevelopTradeTransfer.vue b/src/views/daxpay/common/develop/DevelopTradeTransfer.vue new file mode 100644 index 000000000..0a8d203dd --- /dev/null +++ b/src/views/daxpay/common/develop/DevelopTradeTransfer.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue index 0931b0293..2944e154e 100644 --- a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue +++ b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue @@ -6,7 +6,7 @@