From af40ab5fc1027f4c73f08af945cb0528bef9ca7d Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 29 Sep 2024 23:04:56 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E9=80=9A=E9=81=93=E6=94=B6=E9=93=B6?=
 =?UTF-8?q?=E5=8F=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../daxpay/{ChannelEnum.ts => daxpayEnum.ts}  |  10 +-
 ...{TradeStatusEnum.ts => tradeStatusEnum.ts} |   0
 .../common/develop/auth/ChannelAuth.vue       |   2 +-
 .../common/develop/trade/DevelopTrade.vue     |   2 +-
 .../daxpay/common/merchant/app/MchAppList.vue |  37 +++++-
 .../cashier/ChannelCashierConfig.api.ts       |  72 +++++++++++
 .../cashier/ChannelCashierConfigEdit.vue      |  11 ++
 .../cashier/ChannelCashierConfigList.vue      | 115 ++++++++++++++++++
 .../merchant/cashier/ChannelCashierQrCode.vue |  11 ++
 .../merchant/channel/ChannelConfigEdit.vue    |   8 +-
 .../merchant/channel/ChannelConfigList.vue    |   8 +-
 .../common/notice/notify/NotifyTaskList.vue   |   2 +-
 .../daxpay/common/order/pay/PayOrder.api.ts   |   2 +-
 .../daxpay/common/order/pay/PayOrderList.vue  |   2 +-
 .../common/order/refund/RefundOrder.api.ts    |   2 +-
 .../common/order/refund/RefundOrderList.vue   |   2 +-
 .../order/transfer/TransferOrder.api.ts       |   2 +-
 .../order/transfer/TransferOrderList.vue      |   2 +-
 .../discrepancy/ReconcileDiscrepancyList.vue  |   2 +-
 .../callback/TradeCallbackRecord.api.ts       |   2 +-
 .../callback/TradeCallbackRecordList.vue      |   2 +-
 .../record/flow/TradeFlowRecordList.vue       |   2 +-
 .../record/sync/TradeSyncRecordList.vue       |   2 +-
 23 files changed, 272 insertions(+), 28 deletions(-)
 rename src/enums/daxpay/{ChannelEnum.ts => daxpayEnum.ts} (84%)
 rename src/enums/daxpay/{TradeStatusEnum.ts => tradeStatusEnum.ts} (100%)
 create mode 100644 src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts
 create mode 100644 src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue
 create mode 100644 src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
 create mode 100644 src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue

diff --git a/src/enums/daxpay/ChannelEnum.ts b/src/enums/daxpay/daxpayEnum.ts
similarity index 84%
rename from src/enums/daxpay/ChannelEnum.ts
rename to src/enums/daxpay/daxpayEnum.ts
index a3fe4be1..5f71adb4 100644
--- a/src/enums/daxpay/ChannelEnum.ts
+++ b/src/enums/daxpay/daxpayEnum.ts
@@ -1,7 +1,7 @@
 /**
  * 支付通道
  */
-export enum ChannelEnum {
+export enum DaxpayEnum {
   ALI = 'ali_pay',
   WECHAT = 'wechat_pay',
   UNION_PAY = 'union_pay',
@@ -50,3 +50,11 @@ export enum ChannelAuthStatusEnum {
   /** 数据不存在 */
   NOT_EXIST = 'not_exist',
 }
+
+/**
+ * 收银台类型
+ */
+export enum CashierTypeEnum {
+  WECHAT_PAY = 'wechat_pay',
+  ALIPAY = 'alipay',
+}
diff --git a/src/enums/daxpay/TradeStatusEnum.ts b/src/enums/daxpay/tradeStatusEnum.ts
similarity index 100%
rename from src/enums/daxpay/TradeStatusEnum.ts
rename to src/enums/daxpay/tradeStatusEnum.ts
diff --git a/src/views/daxpay/common/develop/auth/ChannelAuth.vue b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
index ec5b1504..8bd661a0 100644
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.vue
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
@@ -93,7 +93,7 @@
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { ChannelAuthStatusEnum } from '@/enums/daxpay/ChannelEnum'
+  import { ChannelAuthStatusEnum } from '@/enums/daxpay/daxpayEnum'
 
   const { createMessage } = useMessage()
   const { dictDropDown } = useDict()
diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.vue b/src/views/daxpay/common/develop/trade/DevelopTrade.vue
index ef899d8a..02f114ec 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTrade.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTrade.vue
@@ -18,7 +18,7 @@
 
 <script setup lang="ts">
   import { onMounted, ref } from 'vue'
-  import { TradeTypeEnum } from '@/enums/daxpay/ChannelEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
   import { useDict } from '@/hooks/bootx/useDict'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import DevelopTradePay from './DevelopTradePay.vue'
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index 9c7223c1..5e89386d 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -28,7 +28,7 @@
           :loading="loading"
         >
           <vxe-column type="seq" width="60" />
-          <vxe-column field="appId" title="应用号" :min-width="100" >
+          <vxe-column field="appId" title="应用号" :min-width="100">
             <template #default="{ row }">
               <a-link @click="show(row)">{{ row.appId }}</a-link>
             </template>
@@ -59,6 +59,12 @@
                     <a-menu-item>
                       <a-link @click="showNotifyConfig(row)">订阅配置</a-link>
                     </a-menu-item>
+                    <a-menu-item>
+                      <a-link @click="showCashierConfig(row)">收银配置</a-link>
+                    </a-menu-item>
+                    <a-menu-item>
+                      <a-link @click="showCashierQrCOde(row)">收银码牌</a-link>
+                    </a-menu-item>
                     <a-menu-item>
                       <a-link danger @click="remove(row)">删除</a-link>
                     </a-menu-item>
@@ -79,6 +85,8 @@
       />
       <mch-app-edit ref="mchApp" @ok="queryPage" />
       <channel-config-list ref="channelSetup" />
+      <ChannelCashierConfigList ref="channelCashierConfigList" />
+      <ChannelCashierQrCode ref="channelCashierQrCode" />
       <MerchantNotifyConfigList ref="merchantNotifyConfigList" />
     </div>
   </div>
@@ -101,6 +109,8 @@
   import ChannelConfigList from '@/views/daxpay/common/merchant/channel/ChannelConfigList.vue'
   import MerchantNotifyConfigList from '@/views/daxpay/common/merchant/notify/MerchantNotifyConfigList.vue'
   import Icon from '@/components/Icon/Icon.vue'
+  import ChannelCashierConfigList from '@/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue'
+  import ChannelCashierQrCode from '@/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue'
 
   // 使用hooks
   const {
@@ -128,12 +138,15 @@
       { field: 'appName', type: STRING, name: '应用名称', placeholder: '请输入应用名称' },
     ] as QueryField[]
   })
+  const mchNoOptions = ref<LabeledValue[]>([])
+
   const xTable = ref<VxeTableInstance>()
   const xToolbar = ref<VxeToolbarInstance>()
-  const mchApp: any = ref()
-  const channelSetup: any = ref()
-  const merchantNotifyConfigList: any = ref()
-  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchApp = ref<any>()
+  const channelSetup = ref<any>()
+  const merchantNotifyConfigList = ref<any>()
+  const channelCashierConfigList = ref<any>()
+  const channelCashierQrCode = ref<any>()
 
   onMounted(() => {
     vxeBind()
@@ -191,6 +204,20 @@
     merchantNotifyConfigList.value.init(record.appId)
   }
 
+  /**
+   * 收银配置
+   */
+  function showCashierConfig(record) {
+    channelCashierConfigList.value.init(record.appId)
+  }
+
+  /**
+   * 收银码牌
+   */
+  function showCashierQrCOde(record) {
+    channelCashierQrCode.value.init(record.appId)
+  }
+
   /**
    * 删除
    */
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts
new file mode 100644
index 00000000..e5bc4940
--- /dev/null
+++ b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 配置列表
+ */
+export function findAll() {
+  return defHttp.get<Result<MchEntity>>({ url: '/channel/cashier/config/list' })
+}
+
+/**
+ * 配置详情
+ */
+export function get(id) {
+  return defHttp.get<Result<ChannelCashierConfig>>({
+    url: '/channel/cashier/config/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 配置保存
+ */
+export function save(data: ChannelCashierConfig) {
+  return defHttp.post<Result<ChannelCashierConfig>>({
+    url: '/channel/cashier/config/save',
+    data,
+  })
+}
+
+/**
+ * 配置更新
+ */
+export function update(data: ChannelCashierConfig) {
+  return defHttp.post<Result<ChannelCashierConfig>>({
+    url: '/channel/cashier/config/update',
+    data,
+  })
+}
+
+/**
+ * 配置删除
+ */
+export function remove(id) {
+  return defHttp.post<Result<ChannelCashierConfig>>({
+    url: '/channel/cashier/config/remove',
+    params: { id },
+  })
+}
+
+/**
+ * 通道收银台配置
+ */
+export interface ChannelCashierConfig {
+  // 商户号
+  mchNo?: string
+  // 应用号
+  appId?: string
+  // 收银台类型
+  cashierType?: string
+  // 收银台名称
+  cashierName?: string
+  // 支付通道
+  channel?: string
+  // 支付方式
+  payMethod?: string
+  // 是否开启分账
+  allocation?: boolean
+  // 自动分账
+  autoAllocation?: boolean
+}
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue
new file mode 100644
index 00000000..0a8d203d
--- /dev/null
+++ b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
new file mode 100644
index 00000000..51e9dc5e
--- /dev/null
+++ b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
@@ -0,0 +1,115 @@
+<template>
+  <basic-drawer
+    showFooter
+    v-bind="$attrs"
+    width="70%"
+    title="通道配置"
+    :mask-closable="true"
+    :open="visible"
+    @close="handleCancel"
+  >
+    <div class="m-3 p-3 bg-white">
+      <a-spin :spinning="confirmLoading">
+        <a-list
+          style="margin-left: 20px"
+          :grid="{ gutter: 16, xs: 1, sm: 1, md: 2, lg: 3, xl: 4, xxl: 5 }"
+          :data-source="channelConfigs"
+        >
+          <template #renderItem="{ item }">
+            <a-card hoverable style="max-width: 200px; margin-bottom: 20px" @click="setting(item)">
+              <template #cover>
+                <a-image
+                  style="width: 150px; height: 150px; margin-top: 20px"
+                  :preview="false"
+                  :src="getIcon(item.channel)"
+                  :fallback="fallbackImg"
+                />
+              </template>
+              <a-card-meta style="display: flex; justify-content: space-between" :title="item.name">
+                <template #description>
+                  <template v-if="item.enable">
+                    <a-badge dot color="green" />
+                    <span style="color: green">已启用</span>
+                  </template>
+                  <template v-else-if="item.enable === false">
+                    <a-badge dot color="red" />
+                    <span style="color: red">未启用</span>
+                  </template>
+                  <template v-else>
+                    <a-badge dot color="grey" />
+                    <span style="color: grey">未配置</span>
+                  </template>
+                </template>
+              </a-card-meta>
+            </a-card>
+          </template>
+        </a-list>
+      </a-spin>
+    </div>
+    <channel-cashier-config-edit ref="channelCashierConfigEdit" @ok="query" />
+  </basic-drawer>
+</template>
+<script setup lang="ts">
+  import { BasicDrawer } from '@/components/Drawer'
+  import { ref } from 'vue'
+  import { findAll, ChannelCashierConfig } from './ChannelCashierConfig.api'
+  import ChannelCashierConfigEdit from './ChannelCashierConfigEdit.vue'
+
+  const confirmLoading = ref(false)
+
+  const currentAppId = ref('')
+
+  const visible = ref(false)
+
+  /**
+   * 初始化并展示
+   */
+  async function init(appId: string) {
+    visible.value = true
+    currentAppId.value = appId
+    query()
+  }
+
+  /**
+   * 查询
+   */
+  function query() {
+    // 列表信息
+    confirmLoading.value = true
+    findAll(currentAppId.value).then(({ data }) => {
+      channelConfigs.value = data
+      confirmLoading.value = false
+    })
+  }
+
+  /**
+   * 打开支付设置界面
+   */
+  function setting(record: ChannelConfig) {
+    channelConfigEdit.value.show(record)
+  }
+
+  /**
+   * 关闭页面
+   */
+  function handleCancel() {
+    visible.value = false
+  }
+
+  /**
+   * 获取icon
+   */
+  function getIcon(type: string) {
+    switch (type) {
+      case DaxpayEnum.ALI:
+        return alipay
+      case DaxpayEnum.WECHAT:
+        return wechat
+      case DaxpayEnum.UNION_PAY:
+        return unionPay
+      default:
+        return ''
+    }
+  }
+</script>
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue
new file mode 100644
index 00000000..0a8d203d
--- /dev/null
+++ b/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
index 2944e154..10dc62ad 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
   import { ref } from 'vue'
   import { useMessage } from '@/hooks/web/useMessage'
-  import { ChannelEnum } from '@/enums/daxpay/ChannelEnum'
+  import { DaxpayEnum } from '@/enums/daxpay/daxpayEnum'
   import { ChannelConfig } from './ChannelConfig.api'
   import AlipayConfigEdit from '@/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue'
   import WechatPayConfigEdit from '@/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue'
@@ -24,15 +24,15 @@
    */
   function show(record: ChannelConfig) {
     switch (record.channel) {
-      case ChannelEnum.ALI: {
+      case DaxpayEnum.ALI: {
         alipay.value.init(record)
         break
       }
-      case ChannelEnum.WECHAT: {
+      case DaxpayEnum.WECHAT: {
         wechat.value.init(record)
         break
       }
-      case ChannelEnum.UNION_PAY: {
+      case DaxpayEnum.UNION_PAY: {
         union.value.init(record)
         break
       }
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
index 5368150d..ec4840d0 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
@@ -54,7 +54,7 @@
   import { BasicDrawer } from '@/components/Drawer'
   import { ref } from 'vue'
   import { findAll, ChannelConfig } from './ChannelConfig.api'
-  import { ChannelEnum } from '@/enums/daxpay/ChannelEnum'
+  import { DaxpayEnum } from '@/enums/daxpay/daxpayEnum'
   import alipay from '@/assets/daxpay/alipay.svg'
   import wechat from '@/assets/daxpay/wechat.svg'
   import unionPay from '@/assets/daxpay/unionPay.svg'
@@ -112,11 +112,11 @@
    */
   function getIcon(type: string) {
     switch (type) {
-      case ChannelEnum.ALI:
+      case DaxpayEnum.ALI:
         return alipay
-      case ChannelEnum.WECHAT:
+      case DaxpayEnum.WECHAT:
         return wechat
-      case ChannelEnum.UNION_PAY:
+      case DaxpayEnum.UNION_PAY:
         return unionPay
       default:
         return ''
diff --git a/src/views/daxpay/common/notice/notify/NotifyTaskList.vue b/src/views/daxpay/common/notice/notify/NotifyTaskList.vue
index fa774b2b..6b3a6fd9 100644
--- a/src/views/daxpay/common/notice/notify/NotifyTaskList.vue
+++ b/src/views/daxpay/common/notice/notify/NotifyTaskList.vue
@@ -89,7 +89,7 @@
   import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
   import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
   import NotifyRecordList from './NotifyRecordList.vue'
-  import { NotifyContentTypeEnum } from '@/enums/daxpay/ChannelEnum'
+  import { NotifyContentTypeEnum } from '@/enums/daxpay/daxpayEnum'
   import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
diff --git a/src/views/daxpay/common/order/pay/PayOrder.api.ts b/src/views/daxpay/common/order/pay/PayOrder.api.ts
index 58fd7c96..f8e53ce7 100644
--- a/src/views/daxpay/common/order/pay/PayOrder.api.ts
+++ b/src/views/daxpay/common/order/pay/PayOrder.api.ts
@@ -5,7 +5,7 @@ import {
   PayAllocStatusEnum,
   PayRefundStatusEnum,
   PayStatusEnum,
-} from '@/enums/daxpay/TradeStatusEnum'
+} from '@/enums/daxpay/tradeStatusEnum'
 
 /**
  * 分页
diff --git a/src/views/daxpay/common/order/pay/PayOrderList.vue b/src/views/daxpay/common/order/pay/PayOrderList.vue
index b52694db..7d87b7c0 100644
--- a/src/views/daxpay/common/order/pay/PayOrderList.vue
+++ b/src/views/daxpay/common/order/pay/PayOrderList.vue
@@ -161,7 +161,7 @@
     PayAllocStatusEnum,
     PayRefundStatusEnum,
     PayStatusEnum,
-  } from '@/enums/daxpay/TradeStatusEnum'
+  } from '@/enums/daxpay/tradeStatusEnum'
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
diff --git a/src/views/daxpay/common/order/refund/RefundOrder.api.ts b/src/views/daxpay/common/order/refund/RefundOrder.api.ts
index 6b3251a3..863fafa9 100644
--- a/src/views/daxpay/common/order/refund/RefundOrder.api.ts
+++ b/src/views/daxpay/common/order/refund/RefundOrder.api.ts
@@ -6,7 +6,7 @@ import {
   PayRefundStatusEnum,
   PayStatusEnum,
   RefundStatusEnum,
-} from '@/enums/daxpay/TradeStatusEnum'
+} from '@/enums/daxpay/tradeStatusEnum'
 
 /**
  * 分页
diff --git a/src/views/daxpay/common/order/refund/RefundOrderList.vue b/src/views/daxpay/common/order/refund/RefundOrderList.vue
index 73869aa5..d61ef26f 100644
--- a/src/views/daxpay/common/order/refund/RefundOrderList.vue
+++ b/src/views/daxpay/common/order/refund/RefundOrderList.vue
@@ -128,7 +128,7 @@
   import PayOrderInfo from '../pay/PayOrderInfo.vue'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import ALink from '@/components/Link/Link.vue'
-  import { RefundStatusEnum } from '@/enums/daxpay/TradeStatusEnum'
+  import { RefundStatusEnum } from '@/enums/daxpay/tradeStatusEnum'
   import { Icon } from '@/components/Icon'
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
diff --git a/src/views/daxpay/common/order/transfer/TransferOrder.api.ts b/src/views/daxpay/common/order/transfer/TransferOrder.api.ts
index 94a82a5b..2aa155d0 100644
--- a/src/views/daxpay/common/order/transfer/TransferOrder.api.ts
+++ b/src/views/daxpay/common/order/transfer/TransferOrder.api.ts
@@ -1,7 +1,7 @@
 import { defHttp } from '@/utils/http/axios'
 import { PageResult, Result } from '#/axios'
 import { MchEntity } from '#/web'
-import { TransferStatusEnum } from '@/enums/daxpay/TradeStatusEnum'
+import { TransferStatusEnum } from '@/enums/daxpay/tradeStatusEnum'
 
 /**
  * 分页
diff --git a/src/views/daxpay/common/order/transfer/TransferOrderList.vue b/src/views/daxpay/common/order/transfer/TransferOrderList.vue
index 1579f5e6..f1e7c44c 100644
--- a/src/views/daxpay/common/order/transfer/TransferOrderList.vue
+++ b/src/views/daxpay/common/order/transfer/TransferOrderList.vue
@@ -125,7 +125,7 @@
   import { useDict } from '@/hooks/bootx/useDict'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import ALink from '/@/components/Link/Link.vue'
-  import { TransferStatusEnum } from '@/enums/daxpay/TradeStatusEnum'
+  import { TransferStatusEnum } from '@/enums/daxpay/tradeStatusEnum'
   import { Icon } from '@/components/Icon'
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
diff --git a/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
index 6e7adeb4..b80b1763 100644
--- a/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
+++ b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
@@ -118,7 +118,7 @@
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { TradeTypeEnum } from '@/enums/daxpay/ChannelEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
   import ReconcileDiscrepancyInfo from './ReconcileDiscrepancyInfo.vue'
   import ReconcileStatementInfo from '../statement/ReconcileStatementInfo.vue'
   import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
diff --git a/src/views/daxpay/common/record/callback/TradeCallbackRecord.api.ts b/src/views/daxpay/common/record/callback/TradeCallbackRecord.api.ts
index c252f05d..842ef83c 100644
--- a/src/views/daxpay/common/record/callback/TradeCallbackRecord.api.ts
+++ b/src/views/daxpay/common/record/callback/TradeCallbackRecord.api.ts
@@ -1,7 +1,7 @@
 import { defHttp } from '@/utils/http/axios'
 import { PageResult, Result } from '#/axios'
 import { MchEntity } from '#/web'
-import { CallbackStatusEnum } from '@/enums/daxpay/TradeStatusEnum'
+import { CallbackStatusEnum } from '@/enums/daxpay/tradeStatusEnum'
 
 /**
  * 分页
diff --git a/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue b/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
index a82577a6..91327d55 100644
--- a/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
+++ b/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
@@ -87,7 +87,7 @@
   import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
   import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
   import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
-  import { TradeTypeEnum } from '@/enums/daxpay/ChannelEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
diff --git a/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue b/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
index 265566ce..29c1a5ef 100644
--- a/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
+++ b/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
@@ -97,7 +97,7 @@
   import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
   import ALink from '@/components/Link/Link.vue'
   import TradeFlowRecordInfo from './TradeFlowRecordInfo.vue'
-  import { TradeTypeEnum } from '@/enums/daxpay/ChannelEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
diff --git a/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue b/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
index 129fdec5..a9a97f35 100644
--- a/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
+++ b/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
@@ -83,7 +83,7 @@
   import BQuery from '@/components/Bootx/Query/BQuery.vue'
   import { LIST, QueryField, STRING } from '@/components/Bootx/Query/Query'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { TradeTypeEnum } from '@/enums/daxpay/ChannelEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import ALink from '/@/components/Link/Link.vue'
   import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'