diff --git a/src/enums/daxpay/tradeStatusEnum.ts b/src/enums/daxpay/tradeStatusEnum.ts index 42bcd9bf5..de7b266f7 100644 --- a/src/enums/daxpay/tradeStatusEnum.ts +++ b/src/enums/daxpay/tradeStatusEnum.ts @@ -2,6 +2,10 @@ * 支付状态 */ export enum PayStatusEnum { + /** + * 待支付 + */ + WAIT = 'wait', /** * 支付中 */ diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts index 72a5ba04a..a8534be98 100644 --- a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts +++ b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts @@ -43,6 +43,20 @@ export function tradeTransfer(params) { return defHttp.post>({ url: '/develop/trade/transfer', data: params }) } +/** + * 创建收银台链接签名 + */ +export function checkoutSign(param: CheckoutCreatParam) { + return defHttp.post>({ url: '/develop/trade/sign/checkout', data: param }) +} + +/** + * 创建收银台链接 + */ +export function checkoutUrl(params) { + return defHttp.post>({ url: '/develop/trade/checkoutUrl', data: params }) +} + /** * 支付请求参数 */ @@ -213,3 +227,57 @@ export interface TransferResult { /** 签名 */ sign?: string } + +/** + * 收银台创建参数 + */ +export interface CheckoutCreatParam { + /** 收银台类型 */ + checkoutType?: string + /** 商户订单号 */ + 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 + /** 终端IP */ + clientIp?: string + /** 应用号 */ + appId?: string + /** 随机数 */ + nonceStr?: string + /** 签名 */ + sign?: string + /** 请求时间 */ + reqTime?: string +} + +/** + * 收银台响应参数 + */ +export interface CheckoutUrlResult { + /** 收银台链接 */ + url?: string +} diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.vue b/src/views/daxpay/common/develop/trade/DevelopTrade.vue index 02f114ecd..01b9deff5 100644 --- a/src/views/daxpay/common/develop/trade/DevelopTrade.vue +++ b/src/views/daxpay/common/develop/trade/DevelopTrade.vue @@ -11,6 +11,7 @@ + @@ -24,6 +25,7 @@ import DevelopTradePay from './DevelopTradePay.vue' import DevelopTradeRefund from './DevelopTradeRefund.vue' import DevelopTradeTransfer from './DevelopTradeTransfer.vue' + import DevelopTradeCheck from './DevelopTradeCheck.vue' const { dictDropDown } = useDict() @@ -37,6 +39,7 @@ */ async function initData() { tradeTypes.value = await dictDropDown('trade_type') + tradeTypes.value.push({ label: '收银台', value: 'checkout' }) } diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue b/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue new file mode 100644 index 000000000..4c68efa6d --- /dev/null +++ b/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue @@ -0,0 +1,255 @@ + + + + diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue index ca16f4315..5b8cc339a 100644 --- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue +++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue @@ -148,6 +148,7 @@ title: '测试支付', clientIp: '127.0.0.1', amount: 0.01, + allocation: false, }) const rules = computed(() => { return { diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue index 835d73ad0..05d76ce14 100644 --- a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue +++ b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue @@ -26,7 +26,7 @@ placeholder="请选择转账通道" /> - +