ref 去除商户相关字段

2026-08-10 06:46:05 +08:00 · 2025-04-28 17:20:48 +08:00
parent a47acbe5d9
commit cd54120ae4
21 changed files with 0 additions and 61 deletions
--- 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
--- 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(() => {
--- 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
--- 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(() => {
--- 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
  /** 随机数 */
--- 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: '订单号不可为空' }],
--- 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: '订单号不可为空' }],
--- 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: '退款标题不可为空' }],
--- 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)
  }
  /**
--- a/src/views/daxpay/common/notice/callback/CallbackTaskInfo.vue
+++ b/src/views/daxpay/common/notice/callback/CallbackTaskInfo.vue
@@ -38,9 +38,6 @@
        <a-descriptions-item label="创建时间" :span="1">
          {{ task.createTime }}
        </a-descriptions-item>
-        <a-descriptions-item label="商户号" :span="1">
-          {{ task.mchNo }}
-        </a-descriptions-item>
        <a-descriptions-item label="应用AppId" :span="1">
          {{ task.appId }}
        </a-descriptions-item>
--- a/src/views/daxpay/common/notice/notify/NotifyTaskInfo.vue
+++ b/src/views/daxpay/common/notice/notify/NotifyTaskInfo.vue
@@ -38,9 +38,6 @@
        <a-descriptions-item label="创建时间" :span="1">
          {{ task.createTime }}
        </a-descriptions-item>
-        <a-descriptions-item label="商户号" :span="1">
-          {{ task.mchNo }}
-        </a-descriptions-item>
        <a-descriptions-item label="应用AppId" :span="1">
          {{ task.appId }}
        </a-descriptions-item>
--- a/src/views/daxpay/common/order/pay/PayOrderInfo.vue
+++ b/src/views/daxpay/common/order/pay/PayOrderInfo.vue
@@ -80,9 +80,6 @@
        <a-descriptions-item label="创建时间" :span="8">
          {{ order.createTime }}
        </a-descriptions-item>
-        <a-descriptions-item label="商户号" :span="8">
-          {{ order.mchNo }}
-        </a-descriptions-item>
        <a-descriptions-item label="应用AppId" :span="8">
          {{ order.appId }}
        </a-descriptions-item>
--- a/src/views/daxpay/common/order/refund/RefundOrderInfo.vue
+++ b/src/views/daxpay/common/order/refund/RefundOrderInfo.vue
@@ -48,9 +48,6 @@
      <a-descriptions-item label="退款终端ip">
        {{ order.clientIp }}
      </a-descriptions-item>
-      <a-descriptions-item label="商户号" :span="2">
-        {{ order.mchNo }}
-      </a-descriptions-item>
      <a-descriptions-item label="应用AppId" :span="2">
        {{ order.appId }}
      </a-descriptions-item>
--- a/src/views/daxpay/common/order/transfer/TransferOrderInfo.vue
+++ b/src/views/daxpay/common/order/transfer/TransferOrderInfo.vue
@@ -54,9 +54,6 @@
      <a-descriptions-item label="终端ip" :span="4">
        {{ order.clientIp }}
      </a-descriptions-item>
-      <a-descriptions-item label="商户号" :span="2">
-        {{ order.mchNo }}
-      </a-descriptions-item>
      <a-descriptions-item label="应用AppId" :span="2">
        {{ order.appId }}
      </a-descriptions-item>
--- a/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
+++ b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
@@ -62,10 +62,6 @@
      <a-descriptions-item label="交易时间(通道)" :span="1">
        {{ discrepancy.channelTradeTime }}
      </a-descriptions-item>
-
-      <a-descriptions-item label="商户号" :span="1">
-        {{ discrepancy.mchNo }}
-      </a-descriptions-item>
      <a-descriptions-item label="应用AppId" :span="1">
        {{ discrepancy.appId }}
      </a-descriptions-item>
--- 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
   */
--- a/src/views/daxpay/common/reconcile/statement/ReconcileStatementInfo.vue
+++ b/src/views/daxpay/common/reconcile/statement/ReconcileStatementInfo.vue
@@ -61,9 +61,6 @@
      <a-descriptions-item v-if="statement.errorMsg" label="错误信息" :span="1">
        {{ statement.errorMsg }}
      </a-descriptions-item>
-      <a-descriptions-item label="商户号" :span="1">
-        {{ statement.mchNo }}
-      </a-descriptions-item>
      <a-descriptions-item label="应用AppId" :span="1">
        {{ statement.appId }}
      </a-descriptions-item>
--- a/src/views/daxpay/common/record/callback/TradeCallbackRecordInfo.vue
+++ b/src/views/daxpay/common/record/callback/TradeCallbackRecordInfo.vue
@@ -31,9 +31,6 @@
        <a-descriptions-item label="提示消息" v-if="form.errorMsg" :span="4">
          {{ form.errorMsg }}
        </a-descriptions-item>
-        <a-descriptions-item label="商户号" :span="2">
-          {{ form.mchNo }}
-        </a-descriptions-item>
        <a-descriptions-item label="应用AppId" :span="2">
          {{ form.appId }}
        </a-descriptions-item>
--- a/src/views/daxpay/common/record/close/PayCloseRecordInfo.vue
+++ b/src/views/daxpay/common/record/close/PayCloseRecordInfo.vue
@@ -37,9 +37,6 @@
        <a-descriptions-item label="关闭时间">
          {{ record.createTime }}
        </a-descriptions-item>
-        <a-descriptions-item label="商户号">
-          {{ record.mchNo }}
-        </a-descriptions-item>
        <a-descriptions-item label="应用AppId">
          {{ record.appId }}
        </a-descriptions-item>
--- a/src/views/daxpay/common/record/flow/TradeFlowRecordInfo.vue
+++ b/src/views/daxpay/common/record/flow/TradeFlowRecordInfo.vue
@@ -34,9 +34,6 @@
        <a-descriptions-item label="创建时间">
          {{ record.createTime }}
        </a-descriptions-item>
-        <a-descriptions-item label="商户号">
-          {{ record.mchNo }}
-        </a-descriptions-item>
        <a-descriptions-item label="应用AppId">
          {{ record.appId }}
        </a-descriptions-item>
--- a/src/views/daxpay/common/record/sync/TradeSyncRecordInfo.vue
+++ b/src/views/daxpay/common/record/sync/TradeSyncRecordInfo.vue
@@ -40,9 +40,6 @@
        <a-descriptions-item label="错误信息" v-if="form.errorMsg" :span="2">
          {{ form.errorMsg }}
        </a-descriptions-item>
-        <a-descriptions-item label="商户号" :span="2">
-          {{ form.mchNo }}
-        </a-descriptions-item>
        <a-descriptions-item label="应用AppId" :span="2">
          {{ form.appId }}
        </a-descriptions-item>