From cd54120ae46937211fc3db11e86132d8f2adfaf3 Mon Sep 17 00:00:00 2001 From: daxpay Date: Mon, 28 Apr 2025 17:20:48 +0800 Subject: [PATCH] =?UTF-8?q?ref=20=E5=8E=BB=E9=99=A4=E5=95=86=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alipay/config/payment/AlipayConfig.api.ts | 2 -- .../alipay/config/payment/AlipayConfigEdit.vue | 1 - .../channel/union/config/UnionPayConfigEdit.vue | 1 - .../wechat/config/payment/WechatPayConfigEdit.vue | 1 - .../common/develop/trade/DevelopTrade.api.ts | 14 -------------- .../common/develop/trade/DevelopTradeGateway.vue | 1 - .../common/develop/trade/DevelopTradePay.vue | 1 - .../common/develop/trade/DevelopTradeRefund.vue | 1 - .../merchant/cashier/ChannelCashierConfigEdit.vue | 1 - .../common/notice/callback/CallbackTaskInfo.vue | 3 --- .../daxpay/common/notice/notify/NotifyTaskInfo.vue | 3 --- src/views/daxpay/common/order/pay/PayOrderInfo.vue | 3 --- .../daxpay/common/order/refund/RefundOrderInfo.vue | 3 --- .../common/order/transfer/TransferOrderInfo.vue | 3 --- .../discrepancy/ReconcileDiscrepancyInfo.vue | 4 ---- .../reconcile/statement/ReconcileStatement.api.ts | 4 ---- .../reconcile/statement/ReconcileStatementInfo.vue | 3 --- .../record/callback/TradeCallbackRecordInfo.vue | 3 --- .../common/record/close/PayCloseRecordInfo.vue | 3 --- .../common/record/flow/TradeFlowRecordInfo.vue | 3 --- .../common/record/sync/TradeSyncRecordInfo.vue | 3 --- 21 files changed, 61 deletions(-) diff --git a/src/views/daxpay/common/channel/alipay/config/payment/AlipayConfig.api.ts b/src/views/daxpay/common/channel/alipay/config/payment/AlipayConfig.api.ts index 55e1f0c08..6b90fa37f 100644 --- a/src/views/daxpay/common/channel/alipay/config/payment/AlipayConfig.api.ts +++ b/src/views/daxpay/common/channel/alipay/config/payment/AlipayConfig.api.ts @@ -47,8 +47,6 @@ export function saveOrUpdateSub(obj: AlipaySubConfig) { * 支付宝配置 */ export interface AlipayConfig extends MchEntity { - // 商户号 - mchNo?: string // 商户AppId appId?: string // 支付宝商户appId diff --git a/src/views/daxpay/common/channel/alipay/config/payment/AlipayConfigEdit.vue b/src/views/daxpay/common/channel/alipay/config/payment/AlipayConfigEdit.vue index 74dac2370..3452c7162 100644 --- a/src/views/daxpay/common/channel/alipay/config/payment/AlipayConfigEdit.vue +++ b/src/views/daxpay/common/channel/alipay/config/payment/AlipayConfigEdit.vue @@ -276,7 +276,6 @@ 'privateKey', ), isv: isIsv.value, - mchNo: channelConfig.value.mchNo, appId: channelConfig.value.appId, }) .then(() => { diff --git a/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue b/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue index dee7fd1ac..dbcf3b9a2 100644 --- a/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue +++ b/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue @@ -238,7 +238,6 @@ 'acpMiddleCert', 'acpRootCert', ), - mchNo: channelConfig.value.mchNo, appId: channelConfig.value.appId, }).finally(() => { confirmLoading.value = false diff --git a/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfigEdit.vue index 40de704de..1aee5b68a 100644 --- a/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfigEdit.vue +++ b/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfigEdit.vue @@ -358,7 +358,6 @@ 'publicKeyId', ), isv: isIsv.value, - mchNo: channelConfig.value.mchNo, appId: channelConfig.value.appId, }) .then(() => { diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts index f9fd6f911..dc9a3684b 100644 --- a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts +++ b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts @@ -99,8 +99,6 @@ export interface PayParam { notifyUrl?: string /** 终端IP */ clientIp?: string - /** 商户号 */ - mchNo?: string /** 应用号 */ appId?: string /** 随机数 */ @@ -123,8 +121,6 @@ export interface PayResult { status?: string /** 支付参数体 */ payBody?: string - /** 商户号 */ - mchNo?: string /** 应用号 */ appId?: string /** 随机数 */ @@ -155,8 +151,6 @@ export interface RefundParam { notifyUrl?: string /** 终端IP */ clientIp?: string - /** 商户号 */ - mchNo?: string /** 应用号 */ appId?: string /** 随机数 */ @@ -177,8 +171,6 @@ export interface RefundResult { bizRefundNo?: string /** 退款状态 */ status?: string - /** 商户号 */ - mchNo?: string /** 应用号 */ appId?: string /** 随机数 */ @@ -215,8 +207,6 @@ export interface TransferParam { notifyUrl?: string /** 终端IP */ clientIp?: string - /** 商户号 */ - mchNo?: string /** 应用号 */ appId?: string /** 随机数 */ @@ -238,8 +228,6 @@ export interface TransferResult { status?: string /** 提示信息 */ errorMsg?: string - /** 商户号 */ - mchNo?: string /** 应用号 */ appId?: string /** 随机数 */ @@ -286,8 +274,6 @@ export interface GatewayPayParam { notifyUrl?: string /** 终端IP */ clientIp?: string - /** 商户号 */ - mchNo?: string /** 应用号 */ appId?: string /** 随机数 */ diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue b/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue index b17a4e3d3..9bbcf8ea4 100644 --- a/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue +++ b/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue @@ -156,7 +156,6 @@ }) const rules = computed(() => { return { - mchNo: [{ required: true, message: '商户号不可为空' }], appId: [{ required: true, message: '应用号不可为空' }], gatewayPayType: [{ required: true, message: '网关支付方式不可为空' }], bizOrderNo: [{ required: true, message: '订单号不可为空' }], diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue index 3b746ccd4..b23758118 100644 --- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue +++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue @@ -178,7 +178,6 @@ }) const rules = computed(() => { return { - mchNo: [{ required: true, message: '商户号不可为空' }], appId: [{ required: true, message: '应用号不可为空' }], channel: [{ required: true, message: '支付通道不可为空' }], bizOrderNo: [{ required: true, message: '订单号不可为空' }], diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue b/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue index cbb23aa2e..b1735ae43 100644 --- a/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue +++ b/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue @@ -112,7 +112,6 @@ }) const rules = computed(() => { return { - mchNo: [{ required: true, message: '商户号不可为空' }], appId: [{ required: true, message: '应用号不可为空' }], bizRefundNo: [{ required: true, message: '商户退款号不可为空' }], title: [{ required: true, message: '退款标题不可为空' }], diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue index 0de5f91e7..0efd88d3a 100644 --- a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue +++ b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue @@ -170,7 +170,6 @@ initFormEditType(editType) resetForm() form.value.appId = unref(mchApp.appId) - form.value.mchNo = unref(mchApp.mchNo) getInfo(id, editType) } /** diff --git a/src/views/daxpay/common/notice/callback/CallbackTaskInfo.vue b/src/views/daxpay/common/notice/callback/CallbackTaskInfo.vue index 3462e7202..7a4190c9b 100644 --- a/src/views/daxpay/common/notice/callback/CallbackTaskInfo.vue +++ b/src/views/daxpay/common/notice/callback/CallbackTaskInfo.vue @@ -38,9 +38,6 @@ {{ task.createTime }} - - {{ task.mchNo }} - {{ task.appId }} diff --git a/src/views/daxpay/common/notice/notify/NotifyTaskInfo.vue b/src/views/daxpay/common/notice/notify/NotifyTaskInfo.vue index 2a6ef5947..d5ff759b6 100644 --- a/src/views/daxpay/common/notice/notify/NotifyTaskInfo.vue +++ b/src/views/daxpay/common/notice/notify/NotifyTaskInfo.vue @@ -38,9 +38,6 @@ {{ task.createTime }} - - {{ task.mchNo }} - {{ task.appId }} diff --git a/src/views/daxpay/common/order/pay/PayOrderInfo.vue b/src/views/daxpay/common/order/pay/PayOrderInfo.vue index 5907e46a9..08614eee8 100644 --- a/src/views/daxpay/common/order/pay/PayOrderInfo.vue +++ b/src/views/daxpay/common/order/pay/PayOrderInfo.vue @@ -80,9 +80,6 @@ {{ order.createTime }} - - {{ order.mchNo }} - {{ order.appId }} diff --git a/src/views/daxpay/common/order/refund/RefundOrderInfo.vue b/src/views/daxpay/common/order/refund/RefundOrderInfo.vue index 7561a9057..d913b5ee4 100644 --- a/src/views/daxpay/common/order/refund/RefundOrderInfo.vue +++ b/src/views/daxpay/common/order/refund/RefundOrderInfo.vue @@ -48,9 +48,6 @@ {{ order.clientIp }} - - {{ order.mchNo }} - {{ order.appId }} diff --git a/src/views/daxpay/common/order/transfer/TransferOrderInfo.vue b/src/views/daxpay/common/order/transfer/TransferOrderInfo.vue index 2ea6c07c7..d8a38dfd3 100644 --- a/src/views/daxpay/common/order/transfer/TransferOrderInfo.vue +++ b/src/views/daxpay/common/order/transfer/TransferOrderInfo.vue @@ -54,9 +54,6 @@ {{ order.clientIp }} - - {{ order.mchNo }} - {{ order.appId }} diff --git a/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue index b43e99dcc..9c187d428 100644 --- a/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue +++ b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue @@ -62,10 +62,6 @@ {{ discrepancy.channelTradeTime }} - - - {{ discrepancy.mchNo }} - {{ discrepancy.appId }} diff --git a/src/views/daxpay/common/reconcile/statement/ReconcileStatement.api.ts b/src/views/daxpay/common/reconcile/statement/ReconcileStatement.api.ts index 480c1a2e1..4b1b5db8f 100644 --- a/src/views/daxpay/common/reconcile/statement/ReconcileStatement.api.ts +++ b/src/views/daxpay/common/reconcile/statement/ReconcileStatement.api.ts @@ -130,10 +130,6 @@ export interface ReconcileCreatParam { /** 支付通道 */ channel?: string - /** - * 商户号 - */ - mchNo?: string /** * 应用AppId */ diff --git a/src/views/daxpay/common/reconcile/statement/ReconcileStatementInfo.vue b/src/views/daxpay/common/reconcile/statement/ReconcileStatementInfo.vue index d2c2ad995..f092b1c40 100644 --- a/src/views/daxpay/common/reconcile/statement/ReconcileStatementInfo.vue +++ b/src/views/daxpay/common/reconcile/statement/ReconcileStatementInfo.vue @@ -61,9 +61,6 @@ {{ statement.errorMsg }} - - {{ statement.mchNo }} - {{ statement.appId }} diff --git a/src/views/daxpay/common/record/callback/TradeCallbackRecordInfo.vue b/src/views/daxpay/common/record/callback/TradeCallbackRecordInfo.vue index 6c8ff300b..73164be43 100644 --- a/src/views/daxpay/common/record/callback/TradeCallbackRecordInfo.vue +++ b/src/views/daxpay/common/record/callback/TradeCallbackRecordInfo.vue @@ -31,9 +31,6 @@ {{ form.errorMsg }} - - {{ form.mchNo }} - {{ form.appId }} diff --git a/src/views/daxpay/common/record/close/PayCloseRecordInfo.vue b/src/views/daxpay/common/record/close/PayCloseRecordInfo.vue index 125188f05..63870d1d3 100644 --- a/src/views/daxpay/common/record/close/PayCloseRecordInfo.vue +++ b/src/views/daxpay/common/record/close/PayCloseRecordInfo.vue @@ -37,9 +37,6 @@ {{ record.createTime }} - - {{ record.mchNo }} - {{ record.appId }} diff --git a/src/views/daxpay/common/record/flow/TradeFlowRecordInfo.vue b/src/views/daxpay/common/record/flow/TradeFlowRecordInfo.vue index ea4cd24ce..f3b0c00ac 100644 --- a/src/views/daxpay/common/record/flow/TradeFlowRecordInfo.vue +++ b/src/views/daxpay/common/record/flow/TradeFlowRecordInfo.vue @@ -34,9 +34,6 @@ {{ record.createTime }} - - {{ record.mchNo }} - {{ record.appId }} diff --git a/src/views/daxpay/common/record/sync/TradeSyncRecordInfo.vue b/src/views/daxpay/common/record/sync/TradeSyncRecordInfo.vue index ff22b34e3..61c256897 100644 --- a/src/views/daxpay/common/record/sync/TradeSyncRecordInfo.vue +++ b/src/views/daxpay/common/record/sync/TradeSyncRecordInfo.vue @@ -40,9 +40,6 @@ {{ form.errorMsg }} - - {{ form.mchNo }} - {{ form.appId }}