diff --git a/README.md b/README.md
index 5ee9ffc8c7be9ae8a802ae5045611aef43eb570b..6fa81c5d4a7d64f1492206c4b19e8f7a9cf77c34 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,20 @@
 
 ## 🍈项目介绍
 
-> DaxPay是一套基于Bootx-Platform脚手架构建的一套开源支付网关系统，已经对接支付宝、微信支付相关的接口，以及扩展了钱包支付、储值卡支付、现金支付等新的支付方式。
+> DaxPay是一套基于Bootx-Platform脚手架构建的一套开源支付网关系统，已经对接支付宝、微信支付、云闪付相关的接口。
 > 可以独立部署，提供接口供业务系统进行调用，不对原有系统产生影响
 
+
+## 项目启动
+```shell
+# 安装项目依赖, 请使用Node20.x版本, pnpm使用8.0.0到8.5.1版本，推荐直接使用8.5.1版本，更高版本会导致 pnpm-lock.yaml 失效
+pnpm install
+# 启动项目
+pnpm run dev
+# 构建打包
+pnpm build
+```
+
 ## 🍒 文档和源码地址
 ### 文档地址
 在 [Bootx开源文档站](https://bootx.gitee.io/) 下的支付网关(DaxPay)模块下可以进行查阅相关文档，具体链接地址如下：
@@ -52,16 +63,6 @@
 
 手机收银台地址: https://daxpay.demo.bootx.cn/h5/#/cashier/uniCashier
 
-## 项目启动
-```shell
-# 安装项目依赖, 请使用Node16及以上版本
-pnpm install
-# 启动项目
-pnpm run dev
-# 构建打包
-pnpm build
-```
-
 ## 常见问题
 出现以下错误不用管，不影响使用，只在第一次启动时出现，之后就不会再出现
 ```shell
diff --git a/package.json b/package.json
index 2984629646bf17f85746d8e2378ad9b43ddf7f07..723f36754dff7cd27bb94dbde0cbe45b4cf7b490 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,7 @@
     "typescript": "^4.6.3",
     "vite": "4.3.3",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-html": "^3.2.0",
+    "vite-plugin-html": "^3.2.1",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-plugin-mkcert": "^1.10.1",
     "vite-plugin-mock": "^2.9.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d2ebe5f5ba06845ccb0c7b10438ce17936f4ae00..93c8d46a02b0418d470891937777c464c97f7422 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -322,8 +322,8 @@ devDependencies:
     specifier: ^0.5.1
     version: 0.5.1(vite@4.3.3)
   vite-plugin-html:
-    specifier: ^3.2.0
-    version: 3.2.0(vite@4.3.3)
+    specifier: ^3.2.1
+    version: 3.2.2(vite@4.3.3)
   vite-plugin-imagemin:
     specifier: ^0.6.1
     version: 0.6.1(vite@4.3.3)
@@ -11011,8 +11011,8 @@ packages:
       - supports-color
     dev: true
 
-  /vite-plugin-html@3.2.0(vite@4.3.3):
-    resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
+  /vite-plugin-html@3.2.2(vite@4.3.3):
+    resolution: {integrity: sha512-vb9C9kcdzcIo/Oc3CLZVS03dL5pDlOFuhGlZYDCJ840BhWl/0nGeZWf3Qy7NlOayscY4Cm/QRgULCQkEZige5Q==}
     peerDependencies:
       vite: '>=2.0.0'
     dependencies:
diff --git a/src/enums/payment/PayStatus.ts b/src/enums/payment/PayStatus.ts
index 41ca6f24915fe21e11d4e6de881b12c51d20159c..0a9a1a8ae8dc7913708f1c6ef5173cb89bf38009 100644
--- a/src/enums/payment/PayStatus.ts
+++ b/src/enums/payment/PayStatus.ts
@@ -1,16 +1,13 @@
 /**
  * 支付状态
  */
-export enum PayStatus {
+export enum payStatus {
   /** 支付中 */
   PROGRESS = 'progress',
 
   /** 成功 */
   SUCCESS = 'success',
 
-  /** 失败 */
-  FAIL = 'fail',
-
   /** 支付关闭(超时/手动取消/订单已经关闭撤销支付单) */
   CANCEL = 'close',
 
@@ -19,4 +16,7 @@ export enum PayStatus {
 
   /** 全部退款 */
   REFUNDED = 'refunded',
+
+  /** 失败 */
+  FAIL = 'fail',
 }
diff --git a/src/enums/payment/PaySyncStatusEnum.ts b/src/enums/payment/PaySyncStatusEnum.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ccdbebb0c33dee78e9a712db7e3fc72cb248f504
--- /dev/null
+++ b/src/enums/payment/PaySyncStatusEnum.ts
@@ -0,0 +1,17 @@
+/**
+ * 支付同步状态
+ */
+export enum PaySyncStatus {
+  // 支付查询失败
+  FAIL = 'fail',
+  // 支付成功
+  SUCCESS = 'success',
+  // 支付中
+  PROGRESS = 'progress',
+  // 支付已关闭
+  CLOSED = 'closed',
+  // 支付退款
+  REFUND = 'refund',
+  // 交易不存在
+  NOT_FOUND = 'not_found',
+}
diff --git a/src/enums/payment/RefundStatusEnum.ts b/src/enums/payment/RefundStatusEnum.ts
new file mode 100644
index 0000000000000000000000000000000000000000..5fe2ecfb26873e777a2a26ea2951d36771124008
--- /dev/null
+++ b/src/enums/payment/RefundStatusEnum.ts
@@ -0,0 +1,13 @@
+/**
+ * 退款状态枚举
+ */
+export enum RefundStatus {
+  // 退款中
+  PROGRESS = 'progress',
+  // 成功
+  SUCCESS = 'success',
+  // 关闭
+  CLOSE = 'close',
+  // 失败
+  FAIL = 'fail',
+}
diff --git a/src/enums/payment/RefundSyncStatusEnum.ts b/src/enums/payment/RefundSyncStatusEnum.ts
new file mode 100644
index 0000000000000000000000000000000000000000..23c1cffbb4b371639a46ccad03d82ee100396ab7
--- /dev/null
+++ b/src/enums/payment/RefundSyncStatusEnum.ts
@@ -0,0 +1,13 @@
+/**
+ * 退款同步状态枚举
+ */
+export enum RefundSyncStatus {
+  //退款成功
+  SUCCESS = 'refund_success',
+  //退款失败
+  FAIL = 'refund_fail',
+  //退款中
+  PROGRESS = 'refund_progress',
+  //交易不存在
+  NOT_FOUND = 'pay_not_found',
+}
diff --git a/src/enums/payment/payChannelEnum.ts b/src/enums/payment/payChannelEnum.ts
index 4d122816196dfb5eb4adf2716da8f8cf78bf3fc0..06b797d7fb861100a9b53393b6a3dd4075fd452e 100644
--- a/src/enums/payment/payChannelEnum.ts
+++ b/src/enums/payment/payChannelEnum.ts
@@ -5,9 +5,6 @@ export enum payChannelEnum {
   ALI = 'ali_pay',
   WECHAT = 'wechat_pay',
   UNION_PAY = 'union_pay',
-  CASH = 'cash_pay',
   WALLET = 'wallet_pay',
-  VOUCHER = 'voucher_pay',
-  CREDIT_CARD = 'credit_pay',
   AGGREGATION = 'aggregation_pay',
 }
diff --git a/src/enums/payment/payWayEnum.ts b/src/enums/payment/payMethodEnum.ts
similarity index 84%
rename from src/enums/payment/payWayEnum.ts
rename to src/enums/payment/payMethodEnum.ts
index 2a4fc23eb26f7a50267d6b2301f7bfab0eb73b95..2eb7222ece45dd25040086aa062c19ac94b24928 100644
--- a/src/enums/payment/payWayEnum.ts
+++ b/src/enums/payment/payMethodEnum.ts
@@ -1,7 +1,7 @@
 /**
  * 支付通道
  */
-export enum payWayEnum {
+export enum payMethodEnum {
   NORMAL = 'normal',
   WAP = 'wap',
   APP = 'app',
diff --git a/src/enums/payment/reconcileResultEnum.ts b/src/enums/payment/reconcileResultEnum.ts
new file mode 100644
index 0000000000000000000000000000000000000000..aa6980bbb917d4ea9727ee5604944c828ee035e6
--- /dev/null
+++ b/src/enums/payment/reconcileResultEnum.ts
@@ -0,0 +1,4 @@
+/**
+ * 对账结果枚举
+ */
+export enum ReconcileResult {}
diff --git a/src/enums/payment/voucherEnum.ts b/src/enums/payment/voucherEnum.ts
deleted file mode 100644
index 9b263864fdcf6ae46ed3cd9baac9e127f43919a1..0000000000000000000000000000000000000000
--- a/src/enums/payment/voucherEnum.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 储值卡常量
- */
-export enum VoucherEnum {
-  /**
-   * 状态-正常
-   */
-  STATUS_NORMAL = 'normal',
-
-  /**
-   * 状态-停用
-   */
-  STATUS_FORBIDDEN = 'forbidden',
-
-  /**
-   * 储值卡日志-开通
-   */
-  LOG_ACTIVE = 'active',
-
-  /**
-   * 储值卡日志-预冻结额度
-   */
-  LOG_FREEZE_BALANCE = 'freeze',
-
-  /**
-   * 储值卡日志-扣减并解冻余额
-   */
-  LOG_REDUCE_AND_UNFREEZE_BALANCE = 'reduceAndUnfreeze',
-
-  /**
-   * 储值卡日志-直接支付
-   */
-  LOG_PAY = 'pay',
-  /**
-   * 储值卡日志-取消支付
-   */
-  LOG_CLOSE_PAY = 'closePay',
-
-  /**
-   * 储值卡日志-退款到本卡中
-   */
-  LOG_REFUND_SELF = 'refundSelf',
-}
diff --git a/src/enums/payment/walletEnum.ts b/src/enums/payment/walletEnum.ts
deleted file mode 100644
index d857537f66ac2fb3f1998d964448bb1679616239..0000000000000000000000000000000000000000
--- a/src/enums/payment/walletEnum.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * 钱包枚举
- */
-export enum WalletEnum {
-  /** 钱包状态-正常 */
-  NORMAL = 'normal',
-
-  /** 钱包状态-禁用 */
-  FORBIDDEN = 'forbidden',
-}
-/**
- * 钱包日志枚举
- */
-export enum WalletLogEnum {
-  /**
-   * 钱包日志-开通
-   */
-  ACTIVE = 'active',
-
-  /**
-   * 钱包日志-Admin操作余额变动
-   */
-  ADMIN_CHANGER = 'adminChanger',
-
-  /**
-   * 钱包日志-预冻结额度
-   */
-  FREEZE_BALANCE = 'freeze',
-
-  /**
-   * 钱包日志-解冻额度
-   */
-  UNFREEZE_BALANCE = 'unfreeze',
-
-  /**
-   * 钱包日志-解冻并扣减余额
-   */
-  REDUCE_AND_UNFREEZE_BALANCE = 'reduceAndUnfreeze',
-
-  /**
-   * 钱包日志-直接支付
-   */
-  PAY = 'pay',
-  /**
-   * 钱包日志-取消支付
-   */
-  CLOSE_PAY = 'closePay',
-
-  /**
-   * 钱包日志-退款
-   */
-  REFUND = 'refund',
-
-  /**
-   * 锁定钱包
-   */
-  LOCK = 'lock',
-
-  /**
-   * 解锁钱包
-   */
-  UNLOCK = 'unlock',
-}
-
-/**
- * 操作类型
- */
-export enum WalletOperationEnum {
-  /** 系统操作 */
-  SOURCE_SYSTEM = 'system',
-
-  /** 管理员操作 */
-  SOURCE_ADMIN = 'admin',
-
-  /** 用户操作 */
-  SOURCE_USER = 'user',
-}
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 166af4bb78c32cf1991129d9ce4684d43c6b3d1b..d8219f510bf4a1cf2e82d8c3492000dabcbdf1b7 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -44,9 +44,9 @@ const transform: AxiosTransform = {
     if (!rawData) {
       throw new Error('请求出错，请稍候重试')
     }
-    // 下载流处理
+    // 下载流处理, 直接原样返回
     if (contentType === 'application/octet-stream') {
-      return rawData
+      return res
     }
 
     // 接收的通常是json的数据,这里 code，data，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
@@ -102,7 +102,7 @@ const transform: AxiosTransform = {
     if (apiUrl && isString(apiUrl)) {
       config.url = `${apiUrl}${config.url}`
     }
-    // 请求参数和请求体藕最
+    // 请求参数和请求体转换
     const params = config.params || {}
     const data = config.data || false
     formatDate && data && !isString(data) && formatRequestDate(data)
diff --git a/src/views/demo/cashier/Cashier.api.ts b/src/views/demo/cashier/Cashier.api.ts
index 147dce124851d7ff331a600d80485e241ce6ad84..1876d25c9a7c019cfe1e923a517534e507a7d3e1 100644
--- a/src/views/demo/cashier/Cashier.api.ts
+++ b/src/views/demo/cashier/Cashier.api.ts
@@ -15,10 +15,10 @@ export function simplePayCashier(obj) {
 /**
  * 根据业务ID获取支付状态
  */
-export function findStatusByBusinessId(businessNo) {
+export function findStatusByBizOrderNoeNo(bizOrderNoeNo) {
   return defHttp.get<Result<boolean>>({
     url: '/demo/cashier/queryPayOrderSuccess',
-    params: { businessNo },
+    params: { bizOrderNoeNo },
   })
 }
 
@@ -56,12 +56,12 @@ export function aggregateBarCodePay(obj) {
  * 发起支付后响应对象
  */
 export interface PayOrderResult {
-  // 支付ID
-  paymentId: string
-  // 是否是异步支付
-  asyncPay: boolean
-  // 异步支付通道
-  asyncChannel: string
+  // 商户订单号
+  bizOrderNo: string
+  // 订单号
+  orderNo: string
+  // 支付状态
+  status: string
   // 支付参数体(通常用于发起异步支付的参数)
   payBody: string
 }
diff --git a/src/views/demo/cashier/Cashier.vue b/src/views/demo/cashier/Cashier.vue
index 0ce8012b5010f8a4b276188b6de94897be98d46f..7a7fb3990e3edae896dd9165ba882e549499d756 100644
--- a/src/views/demo/cashier/Cashier.vue
+++ b/src/views/demo/cashier/Cashier.vue
@@ -15,7 +15,7 @@
               <div class="paydemo-type-content">
                 <div class="paydemo-type-name">微信支付</div>
                 <div class="paydemo-type-body">
-                  <div v-for="item in WxPayList" :key="item.payInfo.payWay" @click="handleActive(item.payInfo)">
+                  <div v-for="item in WxPayList" :key="item.payInfo.method" @click="handleActive(item.payInfo)">
                     <div :class="item.payInfo === currentActive ? 'colorChange' : 'paydemoType'">
                       <img :src="item.img" class="paydemo-type-img" />
                       <span class="color-change">{{ item.title }}</span>
@@ -34,7 +34,7 @@
                 </div>
                 <div class="paydemo-type-name">支付宝支付</div>
                 <div class="paydemo-type-body">
-                  <div v-for="item in AliPayList" :key="item.payInfo.payWay" @click="handleActive(item.payInfo)">
+                  <div v-for="item in AliPayList" :key="item.payInfo.method" @click="handleActive(item.payInfo)">
                     <div :class="item.payInfo === currentActive ? 'colorChange' : 'paydemoType'">
                       <img :src="item.img" class="paydemo-type-img" />
                       <span class="color-change">{{ item.title }}</span>
@@ -57,7 +57,7 @@
                   <a target="_blank" href="https://open.unionpay.com/tjweb/ij/tool/qrcodeFormPage">条码仿真工具</a>
                 </div>
                 <div class="paydemo-type-body">
-                  <div v-for="item in UniPayList" :key="item.payInfo.payWay" @click="handleActive(item.payInfo)">
+                  <div v-for="item in UniPayList" :key="item.payInfo.method" @click="handleActive(item.payInfo)">
                     <div :class="item.payInfo === currentActive ? 'colorChange' : 'paydemoType'">
                       <img :src="item.img" class="paydemo-type-img" />
                       <span class="color-change">{{ item.title }}</span>
@@ -66,7 +66,7 @@
                 </div>
                 <div class="paydemo-type-name">聚合支付</div>
                 <div class="paydemo-type-body">
-                  <div v-for="item in aggregationPayList" :key="item.payInfo.payWay" @click="handleActive(item.payInfo)">
+                  <div v-for="item in aggregationPayList" :key="item.payInfo.method" @click="handleActive(item.payInfo)">
                     <div :class="item.payInfo === currentActive ? 'colorChange' : 'paydemoType'">
                       <img :src="item.img" class="paydemo-type-img" />
                       <span class="color-change">{{ item.title }}</span>
@@ -84,9 +84,9 @@
                   <div class="paydemo-form-item">
                     <label>业务单号：</label>
                     <span>
-                      <a-input v-model:value="businessNo" />
+                      <a-input v-model:value="bizOrderNo" />
                     </span>
-                    <a-button type="primary" @click="genBusinessNo">生成</a-button>
+                    <a-button type="primary" @click="genBizOrderNoeNo">生成</a-button>
                   </div>
                   <div class="paydemo-form-item">
                     <label>支付标题：</label>
@@ -120,7 +120,7 @@
                   <div style="margin-top: 20px; text-align: right">
                     <affix :offset-bottom="20" class="mr-1">
                       <span v-if="totalMoney" style="color: #fd482c; font-size: 18px; padding-right: 10px">{{ '¥ ' + totalMoney }}</span>
-                      <a-button type="primary" :disabled="currentActive.payWay == null || !totalMoney" @click="pay">立即支付</a-button>
+                      <a-button type="primary" :disabled="currentActive.method == null || !totalMoney" @click="pay">立即支付</a-button>
                     </affix>
                   </div>
                 </a-form>
@@ -140,14 +140,14 @@
 <script lang="ts" setup>
   import CashierQrCode from './CashierQrCode.vue'
   import CashierBarCode from './CashierBarCode.vue'
-  import { aggregateBarCodePay, createAggregatePayUrl, findStatusByBusinessId, getUniCashierUrl, simplePayCashier } from './Cashier.api'
+  import { aggregateBarCodePay, createAggregatePayUrl, findStatusByBizOrderNoeNo, getUniCashierUrl, simplePayCashier } from './Cashier.api'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { $ref } from 'vue/macros'
   import { nextTick, onMounted, onUnmounted } from 'vue'
   import QrCode from '/@/components/Qrcode/src/Qrcode.vue'
   import { useIntervalFn } from '@vueuse/core'
   import { payChannelEnum } from '/@/enums/payment/payChannelEnum'
-  import { payWayEnum } from '/@/enums/payment/payWayEnum'
+  import { payMethodEnum } from '/src/enums/payment/payMethodEnum'
   import { Affix } from 'ant-design-vue'
 
   const { createMessage } = useMessage()
@@ -158,7 +158,7 @@
   let payForm = $ref<string>()
 
   // 业务单号
-  let businessNo = $ref<string>('')
+  let bizOrderNo = $ref<string>('')
   let title = $ref<string>('测试支付')
   let allocation = $ref<boolean>(false)
   let loading = $ref(false)
@@ -172,46 +172,46 @@
   let h5cashierUrl = $ref<string>('初始化中...')
   // 当前选择支付渠道和方式
   let currentActive = $ref({
-    payChannel: null,
-    payWay: null,
+    channel: null,
+    method: null,
   })
   let AliPayList = $ref([
     {
       img: new URL('./imgs/ali/ali_qr.svg', import.meta.url).href,
       title: '扫码支付',
-      payInfo: { payChannel: payChannelEnum.ALI, payWay: payWayEnum.QRCODE },
+      payInfo: { channel: payChannelEnum.ALI, method: payMethodEnum.QRCODE },
     },
     {
       img: new URL('./imgs/ali/ali_bar.svg', import.meta.url).href,
       title: '条码支付',
-      payInfo: { payChannel: payChannelEnum.ALI, payWay: payWayEnum.BARCODE },
+      payInfo: { channel: payChannelEnum.ALI, method: payMethodEnum.BARCODE },
     },
     {
       img: new URL('./imgs/ali/ali_pc.svg', import.meta.url).href,
       title: 'PC支付',
-      payInfo: { payChannel: payChannelEnum.ALI, payWay: payWayEnum.WEB },
+      payInfo: { channel: payChannelEnum.ALI, method: payMethodEnum.WEB },
     },
     {
       img: new URL('./imgs/ali/ali_wap.svg', import.meta.url).href,
       title: 'wap支付',
-      payInfo: { payChannel: payChannelEnum.ALI, payWay: payWayEnum.WAP },
+      payInfo: { channel: payChannelEnum.ALI, method: payMethodEnum.WAP },
     },
   ])
   let WxPayList = $ref([
     {
       img: new URL('./imgs/wechat/wx_native.svg', import.meta.url),
       title: '扫码支付',
-      payInfo: { payChannel: payChannelEnum.WECHAT, payWay: payWayEnum.QRCODE },
+      payInfo: { channel: payChannelEnum.WECHAT, method: payMethodEnum.QRCODE },
     },
     {
       img: new URL('./imgs/wechat/wx_bar.svg', import.meta.url),
       title: '条码支付',
-      payInfo: { payChannel: payChannelEnum.WECHAT, payWay: payWayEnum.BARCODE },
+      payInfo: { channel: payChannelEnum.WECHAT, method: payMethodEnum.BARCODE },
     },
     {
       img: new URL('./imgs/wechat/wx_h5.svg', import.meta.url).href,
       title: 'wap支付',
-      payInfo: { payChannel: payChannelEnum.WECHAT, payWay: payWayEnum.WAP },
+      payInfo: { channel: payChannelEnum.WECHAT, method: payMethodEnum.WAP },
     },
   ])
   // 云闪付
@@ -219,34 +219,34 @@
     {
       img: new URL('./imgs/wechat/wx_native.svg', import.meta.url),
       title: '扫码支付',
-      payInfo: { payChannel: payChannelEnum.UNION_PAY, payWay: payWayEnum.QRCODE },
+      payInfo: { channel: payChannelEnum.UNION_PAY, method: payMethodEnum.QRCODE },
     },
     {
       img: new URL('./imgs/wechat/wx_bar.svg', import.meta.url),
       title: '条码支付',
-      payInfo: { payChannel: payChannelEnum.UNION_PAY, payWay: payWayEnum.BARCODE },
+      payInfo: { channel: payChannelEnum.UNION_PAY, method: payMethodEnum.BARCODE },
     },
     {
       img: new URL('./imgs/wechat/wx_h5.svg', import.meta.url).href,
       title: 'wap支付',
-      payInfo: { payChannel: payChannelEnum.UNION_PAY, payWay: payWayEnum.WAP },
+      payInfo: { channel: payChannelEnum.UNION_PAY, method: payMethodEnum.WAP },
     },
     {
       img: new URL('./imgs/ali/ali_pc.svg', import.meta.url).href,
       title: 'web支付',
-      payInfo: { payChannel: payChannelEnum.UNION_PAY, payWay: payWayEnum.WEB },
+      payInfo: { channel: payChannelEnum.UNION_PAY, method: payMethodEnum.WEB },
     },
   ])
   let aggregationPayList = $ref([
     {
       img: new URL('./imgs/aggregate/qr_cashier.svg', import.meta.url).href,
       title: '扫码支付',
-      payInfo: { payChannel: payChannelEnum.AGGREGATION, payWay: payWayEnum.QRCODE },
+      payInfo: { channel: payChannelEnum.AGGREGATION, method: payMethodEnum.QRCODE },
     },
     {
       img: new URL('./imgs/aggregate/auto_bar.svg', import.meta.url).href,
       title: '条码支付',
-      payInfo: { payChannel: payChannelEnum.AGGREGATION, payWay: payWayEnum.BARCODE },
+      payInfo: { channel: payChannelEnum.AGGREGATION, method: payMethodEnum.BARCODE },
     },
   ])
   // 结算台下部分内容
@@ -266,7 +266,7 @@
   // 检查支付状态
   const { pause, resume } = useIntervalFn(
     () => {
-      findStatusByBusinessId(businessNo)
+      findStatusByBizOrderNoeNo(bizOrderNo)
         .then((res) => {
           // 成功
           if (res.data) {
@@ -288,7 +288,7 @@
    */
   function initData() {
     // 生成业务编码
-    genBusinessNo()
+    genBizOrderNoeNo()
     // 获取微信H5、支付宝H5、手机收银台的链接地址
     initH5CashierUrl()
   }
@@ -316,10 +316,10 @@
    * 发起支付. 分别处理普通支付和聚合支付
    */
   function pay() {
-    const { payChannel, payWay } = currentActive
+    const { channel, method } = currentActive
     // 聚合支付
-    if (payChannel === payChannelEnum.AGGREGATION) {
-      if (payWay === payWayEnum.BARCODE) {
+    if (channel === payChannelEnum.AGGREGATION) {
+      if (method === payMethodEnum.BARCODE) {
         cashierBarCode.init('请输入支付宝、微信或云闪付条码')
       } else {
         aggregationQr()
@@ -328,18 +328,18 @@
     }
 
     // 普通支付
-    if (payWay === payWayEnum.BARCODE) {
+    if (method === payMethodEnum.BARCODE) {
       let msg: string
-      if (payChannel === payChannelEnum.ALI) {
+      if (channel === payChannelEnum.ALI) {
         msg = '请输入支付宝条码'
-      } else if (payChannel === payChannelEnum.WECHAT) {
+      } else if (channel === payChannelEnum.WECHAT) {
         msg = '请输入微信条码'
       } else {
         msg = '请输入云闪付条码，使用二维码仿真工具获取'
       }
       cashierBarCode.init(msg)
     } else {
-      qrPay(payChannel, payWay)
+      qrPay(channel, method)
     }
   }
 
@@ -348,7 +348,7 @@
    */
   async function aggregationQr() {
     const param = {
-      businessNo,
+      bizOrderNo,
       allocation,
       amount: totalMoney,
       title: title,
@@ -363,20 +363,20 @@
    * 条码支付, 处理普通支付和聚合支付
    */
   function barPay(authCode: string) {
-    const { payChannel, payWay } = currentActive
+    const { channel, method } = currentActive
     // 聚合支付走单独分支
-    if (payChannel === payChannelEnum.AGGREGATION) {
+    if (channel === payChannelEnum.AGGREGATION) {
       aggregationBarPay(authCode)
       return
     }
     // 普通条码支付
     const param = {
       title: title,
-      businessNo,
+      bizOrderNo,
       allocation,
       amount: totalMoney,
-      channel: payChannel,
-      payWay,
+      channel: channel,
+      method,
       authCode,
     }
     simplePayCashier(param).then(() => {
@@ -387,21 +387,21 @@
   /**
    * 扫码支付
    */
-  async function qrPay(payChannel, payWay) {
+  async function qrPay(channel, method) {
     const param = {
       title,
-      businessNo,
+      bizOrderNo,
       allocation,
+      channel,
       amount: totalMoney,
-      channel: payChannel,
-      payWay,
+      method,
     }
     loading = true
     const { data } = await simplePayCashier(param).finally(() => {
       loading = false
     })
     // 云闪付wap和web支付
-    if ([payWayEnum.WAP, payWayEnum.WEB].includes(payWay) && payChannel === payChannelEnum.UNION_PAY) {
+    if ([payMethodEnum.WAP, payMethodEnum.WEB].includes(method) && channel === payChannelEnum.UNION_PAY) {
       payForm = data.payBody
       // 本地提交提交支付表单
       nextTick(() => {
@@ -410,12 +410,12 @@
       })
     }
     // pc支付(微信/支付宝)
-    else if ([payWayEnum.WAP, payWayEnum.WEB].includes(payWay)) {
+    else if ([payMethodEnum.WAP, payMethodEnum.WEB].includes(method)) {
       window.open(data.payBody)
-    } else if (payChannel === payChannelEnum.ALI) {
+    } else if (channel === payChannelEnum.ALI) {
       cashierQrCode.init(data.payBody, '请使用支付宝"扫一扫"进行支付')
       resume()
-    } else if (payChannel === payChannelEnum.WECHAT) {
+    } else if (channel === payChannelEnum.WECHAT) {
       cashierQrCode.init(data.payBody, '请使用微信"扫一扫"进行支付')
       resume()
     } else {
@@ -430,7 +430,7 @@
     const param = {
       title,
       amount: totalMoney,
-      businessNo,
+      bizOrderNo,
       authCode,
     }
     aggregateBarCodePay(param).then(() => {
@@ -440,8 +440,8 @@
   /**
    * 生成业务号
    */
-  function genBusinessNo() {
-    businessNo = 'P' + new Date().getTime()
+  function genBizOrderNoeNo() {
+    bizOrderNo = 'P' + new Date().getTime()
   }
 
   /**
@@ -467,7 +467,7 @@
   function handleCancel() {
     cashierQrCode.handleClose()
     cashierBarCode.handleClose()
-    genBusinessNo()
+    genBizOrderNoeNo()
     pause()
   }
 
diff --git a/src/views/modules/develop/file/FileUpload.api.ts b/src/views/modules/develop/file/FileUpload.api.ts
index 05a28b1b119043e405d8977b6bef0263a884c66e..df5ce127c388f3276d99d231f010196f9984ed1a 100644
--- a/src/views/modules/develop/file/FileUpload.api.ts
+++ b/src/views/modules/develop/file/FileUpload.api.ts
@@ -1,6 +1,6 @@
 import { defHttp } from '/@/utils/http/axios'
 import { PageResult, Result } from '/#/axios'
-import { UpdateFileInfo } from "/@/api/common/FileUpload";
+import { UpdateFileInfo } from '/@/api/common/FileUpload'
 
 /**
  * 分页
diff --git a/src/views/payment/allocation/group/AllocationGroupConfig.vue b/src/views/payment/allocation/group/AllocationGroupConfig.vue
index 94f859c7155445ca38686c41ed12dffc1bb2fb81..7f90cb6e9f8ce7c2b73ee3e2b363ac39ac9bd9dd 100644
--- a/src/views/payment/allocation/group/AllocationGroupConfig.vue
+++ b/src/views/payment/allocation/group/AllocationGroupConfig.vue
@@ -18,15 +18,15 @@
       @edit-activated="editActivatedEvent"
     >
       <vxe-column type="seq" width="60" />
-      <vxe-column field="name" title="账号别名" />
-      <vxe-column field="receiverType" title="接收方类型">
+      <vxe-column field="name" title="账号别名" :min-width="100" />
+      <vxe-column field="receiverType" title="接收方类型" :min-width="100">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('AllocationReceiverType', row.receiverType) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
         </template>
       </vxe-column>
-      <vxe-column field="receiverAccount" title="接收方账号" />
-      <vxe-column field="receiverName" title="接收方姓名" />
-      <vxe-column field="rate" width="150" title="分账比例" :edit-render="{}">
+      <vxe-column field="receiverAccount" title="接收方账号" :min-width="220" />
+      <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
+      <vxe-column field="rate" width="150" title="分账比例" :edit-render="{}" :min-width="100">
         <template #default="{ row }"> {{ row.rate / 100.0 }}% </template>
         <template #edit="{ row }">
           <a-input-number v-model:value="row.rate" :min="0" :max="100" :precision="2" placeholder="请输入分账比例(%)" />
@@ -35,7 +35,7 @@
       <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
         <template #default="{ row }">
           <span>
-            <a href="javascript:" @click="remove(row)">删除</a>
+            <a-link danger @click="remove(row)">删除</a-link>
           </span>
         </template>
       </vxe-column>
@@ -54,6 +54,7 @@
   import { useDict } from '/@/hooks/bootx/useDict'
   import { AllocationGroup, AllocationGroupReceiver, bindReceivers, getReceivers, unbindReceiver, updateRate } from './AllocationGroup.api'
   import AllocationGroupSelect from '/@/views/payment/allocation/group/AllocationGroupSelect.vue'
+  import ALink from '/@/components/Link/Link.vue'
 
   // 使用hooks
   const { resetQueryParams, model, loading } = useTablePage(queryPage)
diff --git a/src/views/payment/allocation/group/AllocationGroupList.vue b/src/views/payment/allocation/group/AllocationGroupList.vue
index c4d8aabd2f4840ed9043f31b281ae8aedd3c9f7f..d4ab90b90b49e3f8d744fcb692f7d81f0d94f3b8 100644
--- a/src/views/payment/allocation/group/AllocationGroupList.vue
+++ b/src/views/payment/allocation/group/AllocationGroupList.vue
@@ -20,27 +20,27 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="name" title="名称">
+        <vxe-column field="name" title="名称" :min-width="160">
           <template #default="{ row }">
             <a-link @click="show(row)">{{ row.name }}</a-link>
           </template>
         </vxe-column>
-        <vxe-column field="channel" title="所属通道">
+        <vxe-column field="channel" title="所属通道" :min-width="100">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="totalRate" title="分账比例">
+        <vxe-column field="totalRate" title="分账比例" :min-width="100">
           <template #default="{ row }"> {{ row.totalRate / 100.0 }}% </template>
         </vxe-column>
-        <vxe-column field="defaultGroup" title="默认分组">
+        <vxe-column field="defaultGroup" title="默认分组" :min-width="100">
           <template #default="{ row }">
             <a-tag color="green" v-if="row.defaultGroup">是</a-tag>
             <a-tag v-else>否</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="remark" title="备注" />
-        <vxe-column fixed="right" width="160" :showOverflow="false" title="操作">
+        <vxe-column field="remark" title="备注" :min-width="160" />
+        <vxe-column fixed="right" :min-width="160" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link danger @click="config(row)">接收方配置</a-link>
             <a-divider type="vertical" />
diff --git a/src/views/payment/allocation/group/AllocationGroupSelect.vue b/src/views/payment/allocation/group/AllocationGroupSelect.vue
index ed758007f7477a8ac57a4db378ad68ea5f88f04d..22c1f32d6398833a512b8c597081ef83d3ae0b95 100644
--- a/src/views/payment/allocation/group/AllocationGroupSelect.vue
+++ b/src/views/payment/allocation/group/AllocationGroupSelect.vue
@@ -2,7 +2,7 @@
   <basic-modal
     destroyOnClose
     title="接收方选择"
-    :width="840"
+    :width="1000"
     :visible="visible"
     :confirmLoading="loading"
     :maskClosable="false"
@@ -15,17 +15,17 @@
     </vxe-toolbar>
     <vxe-table row-id="id" ref="xTable" :height="350" :checkbox-config="checkboxConfig" :loading="loading" :data="pagination.records">
       <vxe-column type="checkbox" width="50" />
-      <vxe-column field="name" title="账号别名" />
-      <vxe-column field="receiverType" title="分账接收方类型">
+      <vxe-column field="name" title="账号别名" :min-width="100"/>
+      <vxe-column field="receiverType" title="分账接收方类型" :min-width="100">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('AllocationReceiverType', row.receiverType) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
         </template>
       </vxe-column>
-      <vxe-column field="receiverAccount" title="接收方账号" />
-      <vxe-column field="receiverName" title="接收方姓名" />
-      <vxe-column field="relationType" title="分账关系">
+      <vxe-column field="receiverAccount" title="接收方账号" :min-width="160" />
+      <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
+      <vxe-column field="relationType" title="分账关系" :min-width="100">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('AllocationRelationType', row.relationType) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocRelationType', row.relationType) }}</a-tag>
         </template>
       </vxe-column>
     </vxe-table>
diff --git a/src/views/payment/order/allocation/AllocationOrder.api.ts b/src/views/payment/allocation/order/AllocationOrder.api.ts
similarity index 85%
rename from src/views/payment/order/allocation/AllocationOrder.api.ts
rename to src/views/payment/allocation/order/AllocationOrder.api.ts
index 075fa08e90110c45289cb02d54448a2ac45a9c0d..a8e2c78d3ab443b16e05871e05ef3614ded9019f 100644
--- a/src/views/payment/order/allocation/AllocationOrder.api.ts
+++ b/src/views/payment/allocation/order/AllocationOrder.api.ts
@@ -75,10 +75,10 @@ export function retry(id) {
 /**
  * 查询分账结果
  */
-export function sync(id){
+export function sync(allocationNo){
   return defHttp.post<Result<AllocationOrder>>({
     url: '/order/allocation/sync',
-    params: { id },
+    params: { allocationNo },
   })
 }
 
@@ -86,20 +86,22 @@ export function sync(id){
  * 分账订单
  */
 export interface AllocationOrder extends BaseEntity {
+  // 分账单号
+  allocationNo?: string
+  // 商户分账单号
+  bizAllocationNo?: string
+  // 通道分账号
+  outAllocationNo?: string
   // 支付订单ID
-  paymentId?: string
-  // 分账订单号
+  orderId?: string
+  // 支付订单号
   orderNo?: string
-  // 支付标题
+  // 商户支付订单号
+  bizOrderNo?: string
+  // 外部系统支付订单号
+  outOrderNo?: string
+  // 支付订单标题
   title?: string
-  // 网关支付订单号
-  gatewayPayOrderNo?: string
-  // 网关分账单号
-  gatewayAllocationNo?: string
-  // 分账单号
-  allocationNo?: string
-  // 外部请求号
-  outReqNo?: string
   // 所属通道
   channel?: string
   // 总分账金额
@@ -108,6 +110,10 @@ export interface AllocationOrder extends BaseEntity {
   description?: string
   // 状态
   status?: string
+  // 处理结果
+  result?: string
+  // 错误码
+  errorCode?: string
   // 错误原因
   errorMsg?: string
   // 完成时间
diff --git a/src/views/payment/order/allocation/AllocationOrderDetailInfo.vue b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
similarity index 77%
rename from src/views/payment/order/allocation/AllocationOrderDetailInfo.vue
rename to src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
index d8591b466cb9f491047865e49875d6ec8f374f9a..cc988ccf5899d930b5bfc0cef45373dbe4d0db55 100644
--- a/src/views/payment/order/allocation/AllocationOrderDetailInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
@@ -1,35 +1,35 @@
 <template>
   <basic-modal
-    title="查看对账单信息"
+    title="查看分账单信息"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="modalWidth"
+    :width="1000"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions title="" :column="{ md: 1, sm: 1, xs: 1 }">
+      <a-descriptions title="" bordered :column="{ md: 2, sm: 1, xs: 1 }">
         <a-descriptions-item label="接收方姓名">
           {{ order.receiverName }}
         </a-descriptions-item>
         <a-descriptions-item label="分账接收方类型">
-          <a-tag>{{ dictConvert('AllocationReceiverType', order.receiverType) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocReceiverType', order.receiverType) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="分账比例"> {{ order.rate / 100.0 }}% </a-descriptions-item>
-        <a-descriptions-item label="分账金额"> {{ order.amount / 100.0 }}元 </a-descriptions-item>
+        <a-descriptions-item label="分账金额(元)"> {{ order.amount ? (order.amount / 100).toFixed(2) : 0 }} </a-descriptions-item>
         <a-descriptions-item label="分账结果">
-          <a-tag>{{ dictConvert('AllocationDetailResult', order.result) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocDetailResult', order.result) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="错误代码">
+        <a-descriptions-item label="完成时间">
+          {{ order.finishTime }}
+        </a-descriptions-item>
+        <a-descriptions-item label="错误代码" v-if="order.errorCode">
           {{ order.errorCode }}
         </a-descriptions-item>
-        <a-descriptions-item label="错误原因">
+        <a-descriptions-item label="错误原因" v-if="order.errorMsg">
           {{ order.errorMsg }}
         </a-descriptions-item>
-        <a-descriptions-item label="完成时间">
-          {{ order.finishTime }}
-        </a-descriptions-item>
       </a-descriptions>
     </a-spin>
     <template #footer>
diff --git a/src/views/payment/order/allocation/AllocationOrderDetailList.vue b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
similarity index 81%
rename from src/views/payment/order/allocation/AllocationOrderDetailList.vue
rename to src/views/payment/allocation/order/AllocationOrderDetailList.vue
index 8fda53af77b82ae67ce54b7230b315c26db485db..63895f4cf50f3c62669bc282263a94ac1adb7e11 100644
--- a/src/views/payment/order/allocation/AllocationOrderDetailList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
@@ -3,28 +3,28 @@
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
     <vxe-table row-id="id" ref="xTable" :data="records" :loading="loading" :cell-style="cellStyle">
       <vxe-column type="seq" width="60" />
-      <vxe-column field="receiverName" title="接收方姓名" max-width="100" />
-      <vxe-column field="receiverType" title="接收方类型" max-width="100">
+      <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
+      <vxe-column field="receiverType" title="接收方类型" :min-width="100">
         <template #default="{ row }">
-          {{ dictConvert('AllocationReceiverType', row.receiverType) }}
+          {{ dictConvert('AllocReceiverType', row.receiverType) }}
         </template>
       </vxe-column>
-      <vxe-column field="rate" title="分账比例" max-width="70">
+      <vxe-column field="rate" title="分账比例" :min-width="100">
         <template #default="{ row }"> {{ row.rate / 100.0 }}% </template>
       </vxe-column>
-      <vxe-column field="amount" title="分账金额" max-width="150">
+      <vxe-column field="amount" title="分账金额" :min-width="100">
         <template #default="{ row }"> {{ row.amount / 100.0 }} 元 </template>
       </vxe-column>
-      <vxe-column field="result" title="分账结果" width="130">
-        <template #default="{ row }"> {{ dictConvert('AllocationDetailResult', row.result) }} </template>
+      <vxe-column field="result" title="分账结果" :min-width="130">
+        <template #default="{ row }"> {{ dictConvert('AllocDetailResult', row.result) }} </template>
       </vxe-column>
-      <vxe-column field="result" title="错误原因" max-width="170">
+      <vxe-column field="result" title="错误原因" :min-width="160">
         <template #default="{ row }"> {{ row.errorMsg }} </template>
       </vxe-column>
-      <vxe-column field="result" title="完成时间" width="150">
+      <vxe-column field="result" title="完成时间" :min-width="160">
         <template #default="{ row }"> {{ row.finishTime }} </template>
       </vxe-column>
-      <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
+      <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
         <template #default="{ row }">
           <span>
             <a href="javascript:" @click="show(row)">查看</a>
diff --git a/src/views/payment/order/allocation/AllocationOrderInfo.vue b/src/views/payment/allocation/order/AllocationOrderInfo.vue
similarity index 52%
rename from src/views/payment/order/allocation/AllocationOrderInfo.vue
rename to src/views/payment/allocation/order/AllocationOrderInfo.vue
index 64032d40141c65ada25af2d8283b99ae4e580916..60130959eb2c8951c92ba435f3a3610725321314 100644
--- a/src/views/payment/order/allocation/AllocationOrderInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderInfo.vue
@@ -1,51 +1,63 @@
 <template>
   <basic-modal
-    title="查看对账单信息"
+    title="查看分账单信息"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="modalWidth"
+    :width="1200"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions title="" :column="{ md: 2, sm: 1, xs: 1 }">
-        <a-descriptions-item label="分账订单号">
-          {{ order.orderNo }}
+      <a-descriptions title="" bordered>
+        <a-descriptions-item label="支付订单标题" :span="2">
+          {{ order.title }}
         </a-descriptions-item>
-        <a-descriptions-item label="支付订单ID">
-          {{ order.paymentId }}
+        <a-descriptions-item label="所属通道" :span="2">
+          {{ dictConvert('PayChannel', order.channel) }}
         </a-descriptions-item>
-        <a-descriptions-item label="支付订单标题">
-          {{ order.title }}
+        <a-descriptions-item label="总分账金额(元)" :span="2">
+          {{ order.amount ? (order.amount / 100).toFixed(2) : 0 }}
+        </a-descriptions-item>
+        <a-descriptions-item label="状态" :span="2">
+          {{ dictConvert('AllocOrderStatus', order.status) }}
         </a-descriptions-item>
-        <a-descriptions-item label="网关支付订单号">
-          {{ order.gatewayPayOrderNo }}
+        <a-descriptions-item label="处理结果" :span="2">
+          {{ dictConvert('AllocOrderResult', order.result) }}
         </a-descriptions-item>
-        <a-descriptions-item label="网关分账单号">
-          {{ order.gatewayAllocationNo }}
+        <a-descriptions-item label="分账描述" :span="2">
+          {{ order.description }}
         </a-descriptions-item>
-        <a-descriptions-item label="分账单号">
+        <a-descriptions-item label="分账号" :span="2">
           {{ order.allocationNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="所属通道">
-          <a-tag>{{ dictConvert('PayChannel', order.channel) }}</a-tag>
+        <a-descriptions-item label="支付订单号" :span="2">
+          {{ order.orderNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="总分账金额">
-          {{ order.amount }}
+        <a-descriptions-item label="商户分账号" :span="2">
+          {{ order.allocationNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="状态">
-          {{ dictConvert('AllocationOrderStatus', order.status) }}
+        <a-descriptions-item label="商户支付订单号" :span="2">
+          {{ order.bizOrderNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="错误原因">
-          {{ order.errorMsg }}
+        <a-descriptions-item label="通道分账号" :span="2">
+          {{ order.outAllocationNo || '无' }}
         </a-descriptions-item>
-        <a-descriptions-item label="完成时间">
-          {{ order.finishTime }}
+        <a-descriptions-item label="通道支付订单号" :span="2">
+          {{ order.outOrderNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="创建时间">
+        <a-descriptions-item label="创建时间" :span="2">
           {{ order.createTime }}
         </a-descriptions-item>
+        <a-descriptions-item label="完成时间" :span="2">
+          {{ order.finishTime }}
+        </a-descriptions-item>
+        <a-descriptions-item v-if="order.errorCode" label="错误编码" :span="2">
+          {{ order.errorMsg }}
+        </a-descriptions-item>
+        <a-descriptions-item v-if="order.errorMsg" label="错误原因" :span="2">
+          {{ order.errorMsg }}
+        </a-descriptions-item>
       </a-descriptions>
     </a-spin>
     <template #footer>
diff --git a/src/views/payment/order/allocation/AllocationOrderList.vue b/src/views/payment/allocation/order/AllocationOrderList.vue
similarity index 77%
rename from src/views/payment/order/allocation/AllocationOrderList.vue
rename to src/views/payment/allocation/order/AllocationOrderList.vue
index 69bb733c252e76c76af49f7a6487263260299dad..81f5550bbb9b93af2c21c94e9cac3fd3aabff778 100644
--- a/src/views/payment/order/allocation/AllocationOrderList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderList.vue
@@ -14,27 +14,40 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="allocationNo" title="分账单号" />
-        <vxe-column field="title" title="订单标题" />
-        <vxe-column field="paymentId" title="支付订单ID" />
-        <vxe-column field="channel" title="所属通道">
+        <vxe-column field="allocationNo" title="分账单号" :min-width="220">
+          <template #default="{ row }">
+            <a @click="show(row)">
+              {{ row.allocationNo }}
+            </a>
+          </template>
+        </vxe-column>
+        <vxe-column field="title" title="订单标题" :min-width="150" />
+        <vxe-column field="orderNo" title="支付订单号" :min-width="220">
+          <template #default="{ row }">
+            <a @click="showPayOrder(row)">
+              {{ row.orderNo }}
+            </a>
+          </template>
+        </vxe-column>
+
+        <vxe-column field="channel" title="所属通道" :min-width="100">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="amount" title="总分账金额">
-          <template #default="{ row }"> {{ row.amount / 100.0 }}元 </template>
+        <vxe-column field="amount" title="总分账金额(元)" :min-width="120">
+          <template #default="{ row }"> {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }} </template>
         </vxe-column>
-        <vxe-column field="status" title="状态">
+        <vxe-column field="status" title="状态" :min-width="100">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('AllocationOrderStatus', row.status) }}</a-tag>
+            <a-tag>{{ dictConvert('AllocOrderStatus', row.status) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="result" title="分账结果" width="130">
-          <template #default="{ row }"> {{ dictConvert('AllocationOrderResult', row.result) }} </template> </vxe-column
-        ><vxe-column field="errorMsg" title="错误原因" />
-        <vxe-column field="createTime" title="创建时间" />
-        <vxe-column fixed="right" width="200" :showOverflow="false" title="操作">
+        <vxe-column field="result" title="分账结果" :min-width="100">
+          <template #default="{ row }"> {{ dictConvert('AllocOrderResult', row.result) }} </template> </vxe-column
+        ><vxe-column field="errorMsg" title="错误原因" :min-width="160" />
+        <vxe-column field="createTime" title="创建时间" :min-width="160" />
+        <vxe-column fixed="right" :min-width="200" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
             <a-divider type="vertical" />
@@ -71,6 +84,7 @@
         @page-change="handleTableChange"
       />
     </div>
+    <pay-order-info ref="payOrderInfo" />
     <allocation-order-info ref="allocationOrderInfo" />
     <allocation-order-detail-list ref="allocationOrderDetailList" />
   </div>
@@ -91,12 +105,13 @@
   import { FormEditType } from '/@/enums/formTypeEnum'
   import AllocationOrderDetailList from './AllocationOrderDetailList.vue'
   import AllocationOrderInfo from './AllocationOrderInfo.vue'
+  import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
     useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
+  const { createMessage, createConfirm } = useMessage()
+  const { dictConvert } = useDict()
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
@@ -104,6 +119,7 @@
   const allocationOrderInfo = $ref<any>()
 
   let payChannelList = $ref<LabeledValue[]>([])
+  const payOrderInfo = $ref<any>()
 
   const fields = computed(() => {
     return [
@@ -149,6 +165,13 @@
     allocationOrderDetailList.init(record)
   }
 
+  /**
+   * 查看支付单信息
+   */
+  function showPayOrder(record) {
+    payOrderInfo.init(record.orderNo)
+  }
+
   /**
    * 同步分账状态
    * @param record
@@ -159,7 +182,7 @@
       title: '同步分账状态',
       content: '确定同步分账状态吗？',
       onOk: () => {
-        sync(record.id).then(() => {
+        sync(record.allocationNo).then(() => {
           createMessage.success('同步成功')
           queryPage()
         })
diff --git a/src/views/payment/allocation/receiver/AllocationReceiverList.vue b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
index 536d3758a953341b3b60ccf4fdbd1fa389f58bc6..b16d4141fddfe0af421db3ea53a702625cf4392a 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
@@ -20,30 +20,30 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="name" title="账号别名" />
-        <vxe-column field="channel" title="所属通道">
+        <vxe-column field="name" title="账号别名" :min-width="100"/>
+        <vxe-column field="channel" title="所属通道" :min-width="100">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="receiverType" title="接收方类型">
+        <vxe-column field="receiverType" title="接收方类型" :min-width="100">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('AllocationReceiverType', row.receiverType) }}</a-tag>
+            <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="receiverAccount" title="接收方账号" />
-        <vxe-column field="receiverName" title="接收方姓名" />
-        <vxe-column field="relationType" title="分账关系">
+        <vxe-column field="receiverAccount" title="接收方账号" :min-width="220" />
+        <vxe-column field="receiverName" title="接收方姓名" :min-width="160" />
+        <vxe-column field="relationType" title="分账关系" :min-width="100">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('AllocationRelationType', row.relationType) }}</a-tag>
+            <a-tag>{{ dictConvert('AllocRelationType', row.relationType) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="sync" title="是否同步">
+        <vxe-column field="sync" title="是否同步" :min-width="100">
           <template #default="{ row }">
             <a-tag>{{ row.sync ? '已同步' : '未同步' }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column fixed="right" width="220" :showOverflow="false" title="操作">
+        <vxe-column fixed="right" min-width="220" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
             <a-divider type="vertical" />
diff --git a/src/views/payment/channel/alipay/record/AlipayRecord.api.ts b/src/views/payment/channel/alipay/record/AlipayRecord.api.ts
deleted file mode 100644
index 551dc629920d0ded9f806222692ee012fc192043..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/alipay/record/AlipayRecord.api.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result, PageResult } from '/#/axios'
-import { BaseEntity } from '/#/web'
-
-/**
- * 分页
- */
-export function page(params) {
-  return defHttp.get<Result<PageResult<AlipayRecord>>>({
-    url: '/alipay/record/page',
-    params,
-  })
-}
-
-/**
- * 获取详情
- */
-export function get(id) {
-  return defHttp.get<Result<AlipayRecord>>({
-    url: '/alipay/record/findById',
-    params: { id },
-  })
-}
-
-/**
- * 记录
- */
-export interface AlipayRecord extends BaseEntity {
-  // 标题
-  title?: string
-  // 业务类型
-  type?: string
-  // 金额
-  amount?: string
-  // 交易订单号
-  orderId?: string
-  // 交易订单号
-  gatewayOrderNo?: string
-  // 终端ip
-  ip?: string
-  // 网关时间
-  gatewayTime?: string
-}
diff --git a/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue b/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
deleted file mode 100644
index 5ef9cac798f28f2b383f2617ad2950d15e8b3f97..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <basic-modal
-    title="查看"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="标题">
-          {{ alipayRecord.title }}
-        </a-descriptions-item>
-        <a-descriptions-item label="金额(分)">
-          {{ alipayRecord.amount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="本地订单号">
-          {{ alipayRecord.orderId }}
-        </a-descriptions-item>
-        <a-descriptions-item label="网关订单号">
-          {{ alipayRecord.gatewayOrderNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="业务类型">
-          <a-tag>{{ dictConvert('AlipayRecordType', alipayRecord.type) }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="网关时间">
-          {{ alipayRecord.gatewayTime }}
-        </a-descriptions-item>
-        <a-descriptions-item label="记录时间">
-          {{ alipayRecord.createTime }}
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-spin>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-
-<script setup lang="ts">
-  import { get, AlipayRecord } from './AlipayRecord.api'
-  import { $ref } from 'vue/macros'
-  import { BasicModal } from '/@/components/Modal'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useDict } from '/@/hooks/bootx/useDict'
-
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-
-  let loading = $ref(false)
-  let alipayRecord = $ref<AlipayRecord>({})
-
-  /**
-   * 入口
-   */
-  function init(record: AlipayRecord) {
-    visible.value = true
-    alipayRecord = record
-    initData(record.id as string)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData(alipayId) {
-    loading = true
-    const { data } = await get(alipayId)
-    loading = false
-    alipayRecord = data
-  }
-
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/alipay/record/AlipayRecordList.vue b/src/views/payment/channel/alipay/record/AlipayRecordList.vue
deleted file mode 100644
index 91272b22f3346fd97d4303fa46f69d2022e0aaa0..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/alipay/record/AlipayRecordList.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <div>
-    <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" :default-item-count="3" @query="queryPage" @reset="resetQueryParams" />
-    </div>
-    <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-      <vxe-table
-        row-id="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="title" title="标题" />
-        <vxe-column field="type" title="类型">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('AlipayRecordType', row.type) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="amount" title="金额" />
-        <vxe-column field="orderId" title="本地订单ID" width="170" />
-        <vxe-column field="gatewayOrderNo" title="网关订单号" width="170" />
-        <vxe-column field="gatewayTime" title="网关时间" sortable />
-        <vxe-column fixed="right" width="50" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-          </template>
-        </vxe-column>
-      </vxe-table>
-      <vxe-pager
-        size="medium"
-        :loading="loading"
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        @page-change="handleTableChange"
-      />
-      <alipay-record-info ref="alipayRecordInfo" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-  import { computed, onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { page } from './AlipayRecord.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import AlipayRecordInfo from './AlipayRecordInfo.vue'
-  import ALink from '/@/components/Link/Link.vue'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
-  import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
-  import { LabeledValue } from 'ant-design-vue/lib/select'
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
-
-  const alipayRecordInfo = $ref<any>()
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-
-  let recordTypeList = $ref<LabeledValue[]>([])
-
-  const fields = computed(() => {
-    return [
-      { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
-      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入完整本地订单ID' },
-      { field: 'type', type: LIST, name: '记录类型', placeholder: '请选择记录类型', selectList: recordTypeList },
-      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
-    ] as QueryField[]
-  })
-  onMounted(() => {
-    vxeBind()
-    initData()
-    queryPage()
-  })
-
-  /**
-   * 绑定
-   */
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData() {
-    recordTypeList = await dictDropDown('AlipayRecordType')
-  }
-
-  /**
-   * 查看
-   */
-  function show(record) {
-    alipayRecordInfo.init(record)
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-      ...sortParam,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-    return Promise.resolve()
-  }
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/cash/config/CashConfig.api.ts b/src/views/payment/channel/cash/config/CashConfig.api.ts
deleted file mode 100644
index fa9bf318f418659d23fb4bf66f1dee1d2fd73ae1..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/cash/config/CashConfig.api.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result } from '/#/axios'
-import { BaseEntity, KeyValue } from '/#/web'
-
-/**
- * 获取单条
- */
-export function getConfig() {
-  return defHttp.get<Result<CashConfig>>({
-    url: '/cash/config/getConfig',
-  })
-}
-
-/**
- * 更新
- */
-export function update(obj: CashConfig) {
-  return defHttp.post({
-    url: '/cash/config/update',
-    data: obj,
-  })
-}
-
-/**
- * 获取支持的支付方式
- */
-export function findPayWays() {
-  return defHttp.get<Result<KeyValue[]>>({
-    url: '/cash/config/findPayWays',
-  })
-}
-
-/**
- * 现金支付配置
- */
-export interface CashConfig extends BaseEntity {
-  // 是否启用
-  enable?: boolean
-  // 单次支持支持多少钱
-  singleLimit?: number
-  // 支持的支付类型
-  payWays?: string[]
-  // 备注
-  remark?: string
-}
diff --git a/src/views/payment/channel/cash/config/CashConfigEdit.vue b/src/views/payment/channel/cash/config/CashConfigEdit.vue
deleted file mode 100644
index 85624f8ff492712506996f00c2abca58b6114e2f..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/cash/config/CashConfigEdit.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <basic-drawer showFooter v-bind="$attrs" width="60%" title="现金支付配置" :visible="visible" :maskClosable="false" @close="handleCancel">
-    <a-spin :spinning="confirmLoading">
-      <a-form
-        class="small-from-item"
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        :validate-trigger="['blur', 'change']"
-        :label-col="labelCol"
-        :wrapper-col="wrapperCol"
-      >
-        <a-form-item label="主键" name="id" :hidden="true">
-          <a-input v-model:value="form.id" />
-        </a-form-item>
-        <a-form-item label="是否启用" name="enable">
-          <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" />
-        </a-form-item>
-        <a-form-item label="单次支付限额(分)" name="singleLimit">
-          <a-input-number :precision="0" :min="1" v-model:value="form.singleLimit" placeholder="请输入单次支付限额(分)" />
-        </a-form-item>
-        <a-form-item label="支持支付方式" name="payWays">
-          <a-select
-            allowClear
-            mode="multiple"
-            v-model:value="form.payWays"
-            :disabled="showable"
-            :options="payWayList"
-            style="width: 100%"
-            placeholder="选择支付方式"
-          />
-        </a-form-item>
-        <a-form-item label="备注" name="remark">
-          <a-textarea v-model:value="form.remark" placeholder="请输入备注" />
-        </a-form-item>
-      </a-form>
-    </a-spin>
-    <template #footer>
-      <a-space>
-        <a-button key="cancel" @click="handleCancel">取消</a-button>
-        <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
-      </a-space>
-    </template>
-  </basic-drawer>
-</template>
-
-<script setup lang="ts">
-  import { computed, nextTick } from 'vue'
-  import { $ref } from 'vue/macros'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { update, CashConfig, findPayWays, getConfig } from './CashConfig.api'
-  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { BasicDrawer } from '/@/components/Drawer'
-  import { LabeledValue } from 'ant-design-vue/lib/select'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import BasicTitle from '/@/components/Basic/src/BasicTitle.vue'
-  const { handleCancel, search, diffForm, labelCol, wrapperCol, modalWidth, title, confirmLoading, visible, editable, showable } =
-    useFormEdit()
-  // 读取证书内容
-  const { createMessage } = useMessage()
-
-  const formRef = $ref<FormInstance>()
-
-  let payWayList = $ref<LabeledValue[]>([])
-
-  let form = $ref<CashConfig>({})
-
-  // 校验
-  const rules = computed(() => {
-    return {
-      enable: [{ required: true, message: '请选择是否启用' }],
-      singleLimit: [{ required: true, message: '请输入单次支付最多多少金额' }],
-      payWays: [{ required: true, message: '请选择支持的支付类型' }],
-    } as Record<string, Rule[]>
-  })
-
-  // 事件
-  const emits = defineEmits(['ok'])
-  /**
-   * 入口
-   */
-  function init() {
-    visible.value = true
-    resetForm()
-    getInfo()
-  }
-  /**
-   * 获取信息
-   */
-  function getInfo() {
-    confirmLoading.value = true
-    findPayWays().then(({ data }) => {
-      payWayList = data
-    })
-    getConfig().then(({ data }) => {
-      form = data
-      confirmLoading.value = false
-    })
-  }
-  /**
-   * 更新
-   */
-  function handleOk() {
-    formRef?.validate().then(async () => {
-      confirmLoading.value = true
-      await update(form)
-      confirmLoading.value = false
-      handleCancel()
-      createMessage.success('保存成功')
-      emits('ok')
-    })
-  }
-
-  // 重置表单
-  function resetForm() {
-    nextTick(() => {
-      formRef?.resetFields()
-    })
-  }
-  defineExpose({
-    init,
-  })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/cash/record/CashRecord.api.ts b/src/views/payment/channel/cash/record/CashRecord.api.ts
deleted file mode 100644
index 6cf66e9fffd22bad4411defe4aa17fa3473f108f..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/cash/record/CashRecord.api.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result, PageResult } from '/#/axios'
-import { BaseEntity } from '/#/web'
-
-/**
- * 分页
- */
-export function page(params) {
-  return defHttp.get<Result<PageResult<CashRecord[]>>>({
-    url: '/cash/record/page',
-    params,
-  })
-}
-
-/**
- * 详情
- */
-export function get(id) {
-  return defHttp.get<Result<CashRecord>>({
-    url: '/cash/record/findById',
-    params: { id },
-  })
-}
-
-/**
- * 现金记录
- */
-export interface CashRecord extends BaseEntity {
-  // 标题
-  title?: string
-  // 类型
-  type?: string
-  // 金额
-  amount?: string
-  // 交易订单号
-  orderId?: string
-  // 地址
-  ip?: string
-  // 备注
-  remark?: string
-}
diff --git a/src/views/payment/channel/cash/record/CashRecordInfo.vue b/src/views/payment/channel/cash/record/CashRecordInfo.vue
deleted file mode 100644
index 5988d1bba6de66c12c7b913410ef9fc5c8c9346b..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/cash/record/CashRecordInfo.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <basic-modal
-    title="查看"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="标题">
-          {{ cashRecord.title }}
-        </a-descriptions-item>
-        <a-descriptions-item label="金额(分)">
-          {{ cashRecord.amount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="交易订单号">
-          {{ cashRecord.orderId }}
-        </a-descriptions-item>
-        <a-descriptions-item label="业务类型">
-          <a-tag>{{ dictConvert('CashRecordType', cashRecord.type) }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="备注">
-          {{ cashRecord.remark }}
-        </a-descriptions-item>
-        <a-descriptions-item label="交易时间">
-          {{ cashRecord.createTime }}
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-spin>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-
-<script setup lang="ts">
-  import { get, CashRecord } from './CashRecord.api'
-  import { $ref } from 'vue/macros'
-  import { BasicModal } from '/@/components/Modal'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useDict } from '/@/hooks/bootx/useDict'
-
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-
-  let loading = $ref(false)
-  let cashRecord = $ref<CashRecord>({})
-
-  /**
-   * 入口
-   */
-  function init(record: CashRecord) {
-    visible.value = true
-    cashRecord = record
-    initData(record.id as string)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData(cashId) {
-    loading = true
-    const { data } = await get(cashId)
-    loading = false
-    cashRecord = data
-  }
-
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/cash/record/CashRecordList.vue b/src/views/payment/channel/cash/record/CashRecordList.vue
deleted file mode 100644
index 9bf32fc26faae3d9e9d7d02e0bcfbaac33c0d4b1..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/cash/record/CashRecordList.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <div>
-    <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" :default-item-count="3" @query="queryPage" @reset="resetQueryParams" />
-    </div>
-    <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-      <vxe-table
-        row-id="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="title" title="标题" />
-        <vxe-column field="type" title="业务类型">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('CashRecordType', row.type) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="amount" title="金额" width="170" />
-        <vxe-column field="orderId" title="本地订单ID" width="170" />
-        <vxe-column field="remark" title="备注" />
-        <vxe-column field="createTime" title="创建时间" sortable />
-        <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <span>
-              <a-link @click="show(row)">查看</a-link>
-            </span>
-          </template>
-        </vxe-column>
-      </vxe-table>
-      <vxe-pager
-        size="medium"
-        :loading="loading"
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        @page-change="handleTableChange"
-      />
-    </div>
-    <cash-record-info ref="cashRecordInfo" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { computed, onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { page } from './CashRecord.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import CashRecordInfo from './CashRecordInfo.vue'
-  import { LabeledValue } from 'ant-design-vue/lib/select'
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
-
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-  const cashRecordInfo = $ref<any>()
-
-  let recordTypeList = $ref<LabeledValue[]>([])
-
-  // 查询条件
-  const fields = computed(() => {
-    return [
-      { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
-      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入完整本地订单ID' },
-      { field: 'type', type: LIST, name: '记录类型', placeholder: '请选择记录类型', selectList: recordTypeList },
-    ] as QueryField[]
-  })
-
-  onMounted(() => {
-    vxeBind()
-    initData()
-    queryPage()
-  })
-
-  /**
-   * 绑定
-   */
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData() {
-    recordTypeList = await dictDropDown('CashRecordType')
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-      ...sortParam,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-    return Promise.resolve()
-  }
-  /**
-   * 查看
-   */
-  function show(record) {
-    cashRecordInfo.init(record)
-  }
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/payment/channel/config/ChannelPayConfigEdit.vue b/src/views/payment/channel/config/ChannelPayConfigEdit.vue
index 7ff0db20400e2675ac5919c20b265755519e8e9a..5fecf81ed1aa8c403c6d615ad23ced8feeb88cc1 100644
--- a/src/views/payment/channel/config/ChannelPayConfigEdit.vue
+++ b/src/views/payment/channel/config/ChannelPayConfigEdit.vue
@@ -3,8 +3,6 @@
   <wechat-pay-config-edit ref="wechat" @ok="ok" />
   <union-pay-config-edit ref="union" @ok="ok" />
   <wallet-config-edit ref="wallet" @ok="ok" />
-  <voucher-config-edit ref="voucher" @ok="ok" />
-  <cash-config-edit ref="cash" @ok="ok" />
 </template>
 <script setup lang="ts">
   import { $ref } from 'vue/macros'
@@ -14,8 +12,6 @@
   import AlipayConfigEdit from '/@/views/payment/channel/alipay/config/AlipayConfigEdit.vue'
   import WechatPayConfigEdit from '/@/views/payment/channel/wechat/config/WechatPayConfigEdit.vue'
   import WalletConfigEdit from '/@/views/payment/channel/wallet/config/WalletConfigEdit.vue'
-  import VoucherConfigEdit from '/@/views/payment/channel/voucher/config/VoucherConfigEdit.vue'
-  import CashConfigEdit from '/@/views/payment/channel/cash/config/CashConfigEdit.vue'
   import UnionPayConfigEdit from '/@/views/payment/channel/union/config/UnionPayConfigEdit.vue'
 
   const { createMessage } = useMessage()
@@ -24,8 +20,6 @@
   let wechat = $ref<any>()
   let union = $ref<any>()
   let wallet = $ref<any>()
-  let voucher = $ref<any>()
-  let cash = $ref<any>()
   // 事件
   const emits = defineEmits(['ok'])
   /**
@@ -49,14 +43,6 @@
         wallet.init(record)
         break
       }
-      case payChannelEnum.VOUCHER: {
-        voucher.init(record)
-        break
-      }
-      case payChannelEnum.CASH: {
-        cash.init(record)
-        break
-      }
       default: {
         createMessage.info('暂未支持, 请期待...')
       }
diff --git a/src/views/payment/channel/union/record/UnionPayRecord.api.ts b/src/views/payment/channel/union/record/UnionPayRecord.api.ts
deleted file mode 100644
index 819f544d4535ad28be6590fb7180205303d62877..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/union/record/UnionPayRecord.api.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result, PageResult } from '/#/axios'
-import { BaseEntity } from '/#/web'
-
-/**
- * 分页
- */
-export function page(params) {
-  return defHttp.get<Result<PageResult<UnionPayRecord>>>({
-    url: '/union/pay/record/page',
-    params,
-  })
-}
-
-/**
- * 获取详情
- */
-export function get(id) {
-  return defHttp.get<Result<UnionPayRecord>>({
-    url: '/union/pay/record/findById',
-    params: { id },
-  })
-}
-
-/**
- * 记录
- */
-export interface UnionPayRecord extends BaseEntity {
-  // 标题
-  title?: string
-  // 业务类型
-  type?: string
-  // 金额
-  amount?: string
-  // 交易订单号
-  orderId?: string
-  // 交易订单号
-  gatewayOrderNo?: string
-  // 终端ip
-  ip?: string
-  // 网关时间
-  gatewayTime?: string
-}
diff --git a/src/views/payment/channel/union/record/UnionPayRecordInfo.vue b/src/views/payment/channel/union/record/UnionPayRecordInfo.vue
deleted file mode 100644
index bd22964490b77f0df7f2f38f800c62a81aa8c029..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/union/record/UnionPayRecordInfo.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <basic-modal
-    title="查看"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="标题">
-          {{ unionPayRecord.title }}
-        </a-descriptions-item>
-        <a-descriptions-item label="金额(分)">
-          {{ unionPayRecord.amount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="本地订单号">
-          {{ unionPayRecord.orderId }}
-        </a-descriptions-item>
-        <a-descriptions-item label="网关订单号">
-          {{ unionPayRecord.gatewayOrderNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="业务类型">
-          <a-tag>{{ dictConvert('UnionPayRecordType', unionPayRecord.type) }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="网关时间">
-          {{ unionPayRecord.gatewayTime }}
-        </a-descriptions-item>
-        <a-descriptions-item label="记录时间">
-          {{ unionPayRecord.createTime }}
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-spin>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-
-<script setup lang="ts">
-  import { get, UnionPayRecord } from './UnionPayRecord.api'
-  import { $ref } from 'vue/macros'
-  import { BasicModal } from '/@/components/Modal'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useDict } from '/@/hooks/bootx/useDict'
-
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-
-  let loading = $ref(false)
-  let unionPayRecord = $ref<UnionPayRecord>({})
-
-  /**
-   * 入口
-   */
-  function init(record: UnionPayRecord) {
-    visible.value = true
-    unionPayRecord = record
-    initData(record.id as string)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData(alipayId) {
-    loading = true
-    const { data } = await get(alipayId)
-    loading = false
-    unionPayRecord = data
-  }
-
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/union/record/UnionPayRecordList.vue b/src/views/payment/channel/union/record/UnionPayRecordList.vue
deleted file mode 100644
index fcce70e27331a43d633706af12f2bc92caadf0a6..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/union/record/UnionPayRecordList.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <div>
-    <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" :default-item-count="3" @query="queryPage" @reset="resetQueryParams" />
-    </div>
-    <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-      <vxe-table
-        row-id="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="title" title="标题" />
-        <vxe-column field="type" title="类型">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('UnionPayRecordType', row.type) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="amount" title="金额" />
-        <vxe-column field="orderId" title="本地订单ID" width="170" />
-        <vxe-column field="gatewayOrderNo" title="网关订单号" width="170" />
-        <vxe-column field="gatewayTime" title="网关时间" sortable />
-        <vxe-column fixed="right" width="50" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-          </template>
-        </vxe-column>
-      </vxe-table>
-      <vxe-pager
-        size="medium"
-        :loading="loading"
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        @page-change="handleTableChange"
-      />
-      <union-pay-record-info ref="unionPayRecordInfo" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-  import { onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { page } from './UnionPayRecord.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import ALink from '/@/components/Link/Link.vue'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
-  import { LIST, STRING } from '/@/components/Bootx/Query/Query'
-  import UnionPayRecordInfo from './UnionPayRecordInfo.vue'
-  import { LabeledValue } from 'ant-design-vue/lib/select'
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
-
-  let unionPayRecordInfo = $ref<any>()
-
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-  let recordTypeList = $ref<LabeledValue[]>([])
-
-  const fields = [
-    { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
-    { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入完整本地订单ID' },
-    { field: 'type', type: LIST, name: '记录类型', placeholder: '请选择记录类型', selectList: recordTypeList },
-    { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
-  ]
-  onMounted(() => {
-    vxeBind()
-    initData()
-    queryPage()
-  })
-
-  /**
-   * 绑定
-   */
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData() {
-    recordTypeList = await dictDropDown('UnionPayRecordType')
-  }
-
-  /**
-   * 查看
-   */
-  function show(record) {
-    unionPayRecordInfo.init(record)
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-      ...sortParam,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-    return Promise.resolve()
-  }
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/voucher/config/VoucherConfig.api.ts b/src/views/payment/channel/voucher/config/VoucherConfig.api.ts
deleted file mode 100644
index c4eebaf7cf4f221ea402d3d5d5d1c81626371e11..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/config/VoucherConfig.api.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result } from '/#/axios'
-import { BaseEntity, KeyValue } from '/#/web'
-
-/**
- * 获取单条
- */
-export function getConfig() {
-  return defHttp.get<Result<VoucherConfig>>({
-    url: '/voucher/config/getConfig',
-  })
-}
-
-/**
- * 更新
- */
-export function update(obj: VoucherConfig) {
-  return defHttp.post({
-    url: '/voucher/config/update',
-    data: obj,
-  })
-}
-
-/**
- * 获取支持的支付方式
- */
-export function findPayWays() {
-  return defHttp.get<Result<KeyValue[]>>({
-    url: '/voucher/config/findPayWays',
-  })
-}
-
-/**
- * 储值卡配置
- */
-export interface VoucherConfig extends BaseEntity {
-  // 是否启用
-  enable?: boolean
-  // 单次支持支持多少钱
-  singleLimit?: number
-  // 支持的支付类型
-  payWays?: string[]
-  // 备注
-  remark?: string
-}
diff --git a/src/views/payment/channel/voucher/config/VoucherConfigEdit.vue b/src/views/payment/channel/voucher/config/VoucherConfigEdit.vue
deleted file mode 100644
index 4183866179146fdaf27fd85608c858293c7f639a..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/config/VoucherConfigEdit.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <basic-drawer showFooter v-bind="$attrs" width="60%" title="储值卡配置" :visible="visible" :maskClosable="false" @close="handleCancel">
-    <a-spin :spinning="confirmLoading">
-      <a-form
-        class="small-from-item"
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        :validate-trigger="['blur', 'change']"
-        :label-col="labelCol"
-        :wrapper-col="wrapperCol"
-      >
-        <a-form-item label="主键" name="id" :hidden="true">
-          <a-input v-model:value="form.id" />
-        </a-form-item>
-        <a-form-item label="是否启用" name="enable">
-          <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" />
-        </a-form-item>
-        <a-form-item label="单次支付限额(分)" name="singleLimit">
-          <a-input-number :precision="0" :min="1" v-model:value="form.singleLimit" placeholder="请输入单次支付限额(分)" />
-        </a-form-item>
-        <a-form-item label="支持支付方式" name="payWays">
-          <a-select
-            allowClear
-            mode="multiple"
-            v-model:value="form.payWays"
-            :disabled="showable"
-            :options="payWayList"
-            style="width: 100%"
-            placeholder="选择支付方式"
-          />
-        </a-form-item>
-        <a-form-item label="备注" name="remark">
-          <a-textarea v-model:value="form.remark" placeholder="请输入备注" />
-        </a-form-item>
-      </a-form>
-    </a-spin>
-    <template #footer>
-      <a-space>
-        <a-button key="cancel" @click="handleCancel">取消</a-button>
-        <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
-      </a-space>
-    </template>
-  </basic-drawer>
-</template>
-
-<script setup lang="ts">
-  import { computed, nextTick } from 'vue'
-  import { $ref } from 'vue/macros'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { update, VoucherConfig, findPayWays, getConfig } from './VoucherConfig.api'
-  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { BasicDrawer } from '/@/components/Drawer'
-  import { LabeledValue } from 'ant-design-vue/lib/select'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import BasicTitle from '/@/components/Basic/src/BasicTitle.vue'
-  const { handleCancel, search, diffForm, labelCol, wrapperCol, modalWidth, title, confirmLoading, visible, editable, showable } =
-    useFormEdit()
-  const { createMessage } = useMessage()
-
-  const formRef = $ref<FormInstance>()
-
-  let payWayList = $ref<LabeledValue[]>([])
-
-  let form = $ref<VoucherConfig>({})
-
-  // 校验
-  const rules = computed(() => {
-    return {
-      enable: [{ required: true, message: '请选择是否启用' }],
-      singleLimit: [{ required: true, message: '请输入单次支付最多多少金额' }],
-      payWays: [{ required: true, message: '请选择支持的支付类型' }],
-    } as Record<string, Rule[]>
-  })
-
-  // 事件
-  const emits = defineEmits(['ok'])
-  /**
-   * 入口
-   */
-  function init() {
-    visible.value = true
-    resetForm()
-    getInfo()
-  }
-  /**
-   * 获取信息
-   */
-  function getInfo() {
-    confirmLoading.value = true
-    findPayWays().then(({ data }) => {
-      payWayList = data
-    })
-    getConfig().then(({ data }) => {
-      form = data
-      confirmLoading.value = false
-    })
-  }
-  /**
-   * 更新
-   */
-  function handleOk() {
-    formRef?.validate().then(async () => {
-      confirmLoading.value = true
-      await update(form)
-      confirmLoading.value = false
-      handleCancel()
-      createMessage.success('保存成功')
-      emits('ok')
-    })
-  }
-
-  // 重置表单
-  function resetForm() {
-    nextTick(() => {
-      formRef?.resetFields()
-    })
-  }
-  defineExpose({
-    init,
-  })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/voucher/manager/Voucher.api.ts b/src/views/payment/channel/voucher/manager/Voucher.api.ts
deleted file mode 100644
index 34a97831fdf7892962b0a5a759fae17744548633..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/manager/Voucher.api.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result, PageResult } from '/#/axios'
-import { BaseEntity } from '/#/web'
-
-/**
- * 导入
- */
-export function voucherImport(params) {
-  return defHttp.post<Result>({
-    url: '/voucher/import',
-    data: params,
-  })
-}
-
-/**
- * 分页
- */
-export function page(params) {
-  return defHttp.get<Result<PageResult<Voucher[]>>>({
-    url: '/voucher/page',
-    params,
-  })
-}
-
-/**
- * 查询详情
- */
-export function get(id) {
-  return defHttp.get<Result<Voucher>>({
-    url: '/voucher/findById',
-    params: { id },
-  })
-}
-
-/**
- * 储值卡
- */
-export interface Voucher extends BaseEntity {
-  // 卡号
-  cardNo?: string
-  // 面值
-  faceValue?: number
-  // 余额
-  balance?: string
-  // 是否长期有效
-  enduring?: boolean
-  // 开始时间
-  startTime?: string
-  // 结束时间
-  endTime?: string
-  // 状态
-  status?: string
-}
diff --git a/src/views/payment/channel/voucher/manager/VoucherImportModel.vue b/src/views/payment/channel/voucher/manager/VoucherImportModel.vue
deleted file mode 100644
index 2399433f189796009b31a281b9eef925db4a1a27..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/manager/VoucherImportModel.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-  <basic-modal
-    title="储值卡生成"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="false"
-    @cancel="handleCancel"
-  >
-    <a-form
-      class="small-from-item"
-      ref="formRef"
-      :model="form"
-      :rules="rules"
-      :validate-trigger="['blur', 'change']"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
-      <a-form-item label="卡号" name="cardNo">
-        <a-input v-model:value="form.cardNo" placeholder="输入储值卡卡号" />
-      </a-form-item>
-
-      <a-form-item label="面值(分)" name="faceValue">
-        <a-input-number
-          :precision="0"
-          :max="9999999"
-          :min="1"
-          v-model:value="form.faceValue"
-          placeholder="输入储值卡面值(分)"
-          style="width: 100%"
-        />
-      </a-form-item>
-      <a-form-item label="余额(分)" name="balance">
-        <a-input-number
-          :precision="0"
-          :max="form.faceValue"
-          :min="1"
-          v-model:value="form.balance"
-          placeholder="输入储值卡面值(分)"
-          style="width: 100%"
-        />
-      </a-form-item>
-      <a-form-item label="有效期" name="enduring">
-        <a-switch checkedChildren="长期" unCheckedChildren="期限" v-model:checked="form.enduring" />
-      </a-form-item>
-      <a-form-item label="有效期" name="enduring" v-if="!form.enduring">
-        <a-range-picker valueFormat="YYYY-MM-DD" @change="changeTime" />
-      </a-form-item>
-      <a-form-item label="默认状态" name="status">
-        <a-radio-group v-model:value="form.status">
-          <a-radio :value="VoucherEnum.STATUS_NORMAL">启用</a-radio>
-          <a-radio :value="VoucherEnum.STATUS_FORBIDDEN">停用</a-radio>
-        </a-radio-group>
-      </a-form-item>
-    </a-form>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-      <a-button key="forward" :loading="confirmLoading" type="primary" @click="handleOk">提交</a-button>
-    </template>
-  </basic-modal>
-</template>
-
-<script setup lang="ts">
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { $ref } from 'vue/macros'
-  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { computed, nextTick } from 'vue'
-  import BasicModal from '/@/components/Modal/src/BasicModal.vue'
-  import { VoucherEnum } from '/@/enums/payment/voucherEnum'
-  import { voucherImport } from '/@/views/payment/channel/voucher/manager/Voucher.api'
-
-  const { handleCancel, labelCol, wrapperCol, modalWidth, title, confirmLoading, visible, editable, showable, formEditType } = useFormEdit()
-  const { createMessage } = useMessage()
-
-  // 表单
-  const formRef = $ref<FormInstance>()
-  const form = $ref({
-    faceValue: 2000,
-    balance: 2000,
-    enduring: true,
-    dataTime: null,
-    startTime: null,
-    endTime: null,
-    status: VoucherEnum.STATUS_NORMAL,
-  })
-
-  const rules = computed<Record<string, Rule[]>>(() => {
-    return {
-      cardNo: [{ required: true, message: '请输入储值卡卡号' }],
-      faceValue: [{ required: true, message: '请输入储值卡的面值' }],
-      balance: [{ required: true, message: '请输入储值卡的余额' }],
-      enduring: [{ required: true, message: '请选择储值卡有效期类型' }],
-      dataTime: [{ required: form.enduring, message: '请选择有效时间范围' }],
-      status: [{ required: true, message: '请选择默认状态' }],
-    }
-  })
-
-  const emits = defineEmits(['ok'])
-
-  /**
-   * 初始化
-   */
-  function init() {
-    visible.value = true
-    resetForm()
-    confirmLoading.value = false
-  }
-
-  /**
-   * 时间范围变动
-   */
-  function changeTime(_, times) {
-    form.startTime = (times[0] + ' 00:00:00') as any
-    form.endTime = (times[1] + ' 23:59:59') as any
-  }
-
-  /**
-   * 生成储值卡
-   */
-  function handleOk() {
-    formRef?.validate().then(async () => {
-      confirmLoading.value = true
-      form.dataTime = null
-      if (form.enduring) {
-        form.startTime = null
-        form.endTime = null
-      }
-      await voucherImport(form)
-
-      visible.value = false
-      confirmLoading.value = false
-      emits('ok')
-    })
-  }
-  // 重置表单
-  function resetForm() {
-    nextTick(() => {
-      formRef?.resetFields()
-    })
-  }
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/voucher/manager/VoucherInfo.vue b/src/views/payment/channel/voucher/manager/VoucherInfo.vue
deleted file mode 100644
index a852d95b058e949c5953622a74e4739dd350be84..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/manager/VoucherInfo.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<template>
-  <basic-modal
-    title="查看"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="钱包ID">
-          {{ voucher.id }}
-        </a-descriptions-item>
-        <a-descriptions-item label="卡号">
-          {{ voucher.cardNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="余额">
-          {{ voucher.balance }}
-        </a-descriptions-item>
-        <a-descriptions-item label="余额">
-          {{ voucher.balance }}
-        </a-descriptions-item>
-        <a-descriptions-item label="余额(分)">
-          {{ voucher.balance }}
-        </a-descriptions-item>
-        <a-descriptions-item label="长期有效">
-          <a-tag>{{ voucher.enduring ? '长期' : '期限' }}</a-tag>
-        </a-descriptions-item>
-        <template v-if="!voucher.enduring">
-          <a-descriptions-item label="开始时间">
-            {{ voucher.startTime }}
-          </a-descriptions-item>
-          <a-descriptions-item label="结束时间">
-            {{ voucher.endTime }}
-          </a-descriptions-item>
-        </template>
-        <a-descriptions-item label="状态">
-          <a-tag>{{ dictConvert('VoucherStatus', voucher.status) }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="导入时间">
-          {{ voucher.createTime }}
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-spin>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-
-<script setup lang="ts">
-  import { get, Voucher } from './Voucher.api'
-  import { $ref } from 'vue/macros'
-  import { BasicModal } from '/@/components/Modal'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useDict } from '/@/hooks/bootx/useDict'
-
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-
-  let loading = $ref(false)
-  let voucher = $ref<Voucher>({})
-
-  /**
-   * 入口
-   */
-  function init(record: Voucher) {
-    visible.value = true
-    voucher = record
-    initData(record.id as string)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData(voucherId) {
-    loading = true
-    const { data } = await get(voucherId)
-    loading = false
-    voucher = data
-  }
-
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/voucher/manager/VoucherList.vue b/src/views/payment/channel/voucher/manager/VoucherList.vue
deleted file mode 100644
index bf0b9c9b49dee0db2fdbb5696eee567f799dd576..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/manager/VoucherList.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <div>
-    <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
-    </div>
-    <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
-        <template #buttons>
-          <a-button type="primary" @click="importCard">导入储值卡</a-button>
-        </template>
-      </vxe-toolbar>
-      <vxe-table
-        row-id="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="id" title="卡ID" width="170" />
-        <vxe-column field="cardNo" title="卡号" />
-        <vxe-column field="faceValue" title="面值(分)" sortable />
-        <vxe-column field="balance" title="余额(分)" sortable />
-        <vxe-column field="enduring" title="是否长期有效">
-          <template #default="{ row }">
-            <a-tag>{{ row.enduring ? '长期' : '期限' }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="startTime" title="开始时间" sortable />
-        <vxe-column field="endTime" title="结束时间" sortable />
-        <vxe-column field="status" title="状态">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('VoucherStatus', row.status) || '无' }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="createTime" title="创建时间" sortable />
-        <vxe-column fixed="right" width="100" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-            <a-divider type="vertical" />
-            <a-link @click="showRecord(row)">流水</a-link>
-          </template>
-        </vxe-column>
-      </vxe-table>
-      <vxe-pager
-        size="medium"
-        :loading="loading"
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        @page-change="handleTableChange"
-      />
-    </div>
-    <voucher-import-model ref="voucherImportModel" @ok="queryPage" />
-    <voucher-record-list ref="voucherRecordList" />
-    <voucher-info ref="voucherInfo" />
-  </div>
-</template>
-
-<script setup lang="ts">
-  import { computed, onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { page } from './Voucher.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { QueryField, STRING } from '/@/components/Bootx/Query/Query'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import { VxeTableInstance, VxeToolbarInstance, VxePager, VxeTable, VxeToolbar } from 'vxe-table'
-  import ALink from '/@/components/Link/Link.vue'
-  import VoucherImportModel from './VoucherImportModel.vue'
-  import VoucherInfo from './VoucherInfo.vue'
-  import VoucherRecordList from '/@/views/payment/channel/voucher/record/VoucherRecordList.vue'
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, sortChange, resetQueryParams, pagination, pages, sortParam, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
-
-  // 查询条件
-  const fields = computed(() => {
-    return [
-      { field: 'walletId', type: STRING, name: '钱包ID', placeholder: '请输入完整钱包ID' },
-      { field: 'userId', type: STRING, name: '用户ID', placeholder: '请输入完整用户ID' },
-    ] as QueryField[]
-  })
-
-  const voucherImportModel = $ref<any>()
-  const voucherRecordList = $ref<any>()
-  const voucherInfo = $ref<any>()
-
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-
-  onMounted(() => {
-    vxeBind()
-    queryPage()
-  })
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...sortParam,
-      ...pages,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-  }
-
-  /**
-   * 导入储值卡
-   */
-  function importCard() {
-    voucherImportModel.init()
-  }
-
-  /**
-   * 查看
-   */
-  function show(record) {
-    voucherInfo.init(record)
-  }
-
-  /**
-   * 查看记录
-   */
-  function showRecord(record) {
-    voucherRecordList.init(record)
-  }
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/voucher/record/VoucherRecord.api.ts b/src/views/payment/channel/voucher/record/VoucherRecord.api.ts
deleted file mode 100644
index 72f608bf1c47b70fe274cf5c714699613804ea5f..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/record/VoucherRecord.api.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result, PageResult } from '/#/axios'
-import { BaseEntity } from '/#/web'
-
-/**
- * 分页
- */
-export function page(params) {
-  return defHttp.get<Result<PageResult<VoucherRecord>>>({
-    url: '/voucher/record/page',
-    params,
-  })
-}
-
-/**
- * 获取详情
- */
-export function get(id) {
-  return defHttp.get<Result<VoucherRecord>>({
-    url: '/voucher/record/findById',
-    params: { id },
-  })
-}
-
-/**
- * 钱包记录
- */
-export interface VoucherRecord extends BaseEntity {
-  // 储值卡 id
-  voucherId?: string
-  // 标题
-  title?: string
-  // 业务类型
-  type?: string
-  // 金额
-  amount?: string
-  // 变动之前的金额
-  oldAmount?: string
-  // 变动之后的金额
-  newAmount?: string
-  // 交易订单号
-  orderId?: string
-  // 终端ip
-  ip?: string
-}
diff --git a/src/views/payment/channel/voucher/record/VoucherRecordInfo.vue b/src/views/payment/channel/voucher/record/VoucherRecordInfo.vue
deleted file mode 100644
index a93480d296fa2b6ce239d02dc1078ea5347840e4..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/record/VoucherRecordInfo.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <basic-modal
-    title="查看"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="标题">
-          {{ voucherRecord.title }}
-        </a-descriptions-item>
-        <a-descriptions-item label="金额(分)">
-          {{ voucherRecord.amount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="变动前金额(分)">
-          {{ voucherRecord.oldAmount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="变动后金额(分)">
-          {{ voucherRecord.newAmount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="交易订单号">
-          {{ voucherRecord.orderId }}
-        </a-descriptions-item>
-        <a-descriptions-item label="业务类型">
-          <a-tag>{{ dictConvert('VoucherRecordType', voucherRecord.type) }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="导入时间">
-          {{ voucherRecord.createTime }}
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-spin>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-
-<script setup lang="ts">
-  import { get, VoucherRecord } from './VoucherRecord.api'
-  import { $ref } from 'vue/macros'
-  import { BasicModal } from '/@/components/Modal'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useDict } from '/@/hooks/bootx/useDict'
-
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-
-  let loading = $ref(false)
-  let voucherRecord = $ref<VoucherRecord>({})
-
-  /**
-   * 入口
-   */
-  function init(record: VoucherRecord) {
-    visible.value = true
-    voucherRecord = record
-    initData(record.id as string)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData(voucherId) {
-    loading = true
-    const { data } = await get(voucherId)
-    loading = false
-    voucherRecord = data
-  }
-
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/voucher/record/VoucherRecordList.vue b/src/views/payment/channel/voucher/record/VoucherRecordList.vue
deleted file mode 100644
index d8917676f79375fdc325dd6b4819c22d96623068..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/voucher/record/VoucherRecordList.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-  <basic-drawer forceRender v-bind="$attrs" title="储值卡记录" width="60%" :visible="visible" @close="visible = false">
-    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table
-      row-id="id"
-      ref="xTable"
-      :data="pagination.records"
-      :loading="loading"
-      :sort-config="{ remote: true, trigger: 'cell' }"
-      @sort-change="sortChange"
-    >
-      <vxe-column type="seq" title="序号" width="60" />
-      <vxe-column field="title" title="标题" />
-      <vxe-column field="type" title="类型" min-width="170">
-        <template #default="{ row }">
-          <a-tag>{{ dictConvert('VoucherRecordType', row.type) }}</a-tag>
-        </template>
-      </vxe-column>
-      <vxe-column field="amount" title="金额" />
-      <vxe-column field="orderId" title="订单号" />
-      <vxe-column field="createTime" title="创建时间" sortable />
-      <vxe-column fixed="right" width="50" :showOverflow="false" title="操作">
-        <template #default="{ row }">
-          <a-link @click="show(row)">查看</a-link>
-        </template>
-      </vxe-column>
-    </vxe-table>
-    <vxe-pager
-      size="medium"
-      :loading="loading"
-      :current-page="pagination.current"
-      :page-size="pagination.size"
-      :total="pagination.total"
-      @page-change="handleTableChange"
-    />
-    <voucher-record-info ref="voucherRecordInfo" />
-  </basic-drawer>
-</template>
-
-<script setup lang="ts">
-  import { computed, onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { page } from './VoucherRecord.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
-  import { Voucher } from '../manager/Voucher.api'
-  import ALink from '/@/components/Link/Link.vue'
-  import VoucherRecordInfo from './VoucherRecordInfo.vue'
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
-
-  let visible = $ref<boolean>(false)
-  let voucher = $ref<Voucher>({})
-  let voucherRecordInfo = $ref<any>()
-
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-
-  onMounted(() => {
-    vxeBind()
-  })
-
-  /**
-   * 绑定
-   */
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
-
-  /**
-   * 初始化
-   */
-  function init(record: Voucher) {
-    visible = true
-    voucher = record
-    queryPage()
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-      ...sortParam,
-      voucherId: voucher.id,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-    return Promise.resolve()
-  }
-
-  /**
-   * 查看详情
-   */
-  function show(record) {
-    voucherRecordInfo.init(record)
-  }
-
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/wallet/manager/WalletInfo.vue b/src/views/payment/channel/wallet/manager/WalletInfo.vue
index ed41579443788fb7204edea77535842094218e2f..8ca2335b60c911ea2fea7d0f720435df50e3ad4e 100644
--- a/src/views/payment/channel/wallet/manager/WalletInfo.vue
+++ b/src/views/payment/channel/wallet/manager/WalletInfo.vue
@@ -9,25 +9,13 @@
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="钱包ID">
-          {{ wallet.id }}
-        </a-descriptions-item>
-        <a-descriptions-item label="用户ID">
-          {{ wallet.userId }}
-        </a-descriptions-item>
-        <a-descriptions-item label="钱包名称">
-          {{ wallet.name }}
-        </a-descriptions-item>
-        <a-descriptions-item label="余额(分)">
-          {{ wallet.balance }}
-        </a-descriptions-item>
-        <a-descriptions-item label="状态">
-          <a-tag>{{ dictConvert('WalletStatus', wallet.status) }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="创建时间">
-          {{ wallet.createTime }}
-        </a-descriptions-item>
+      <a-descriptions bordered title :column="{ md: 1, sm: 1, xs: 1 }">
+        <a-descriptions-item label="钱包ID">{{ wallet.id }}</a-descriptions-item>
+        <a-descriptions-item label="用户ID">{{ wallet.userId }}</a-descriptions-item>
+        <a-descriptions-item label="钱包名称">{{ wallet.name }}</a-descriptions-item>
+        <a-descriptions-item label="余额(分)">{{ wallet.balance }}</a-descriptions-item>
+        <a-descriptions-item label="状态" ><span :style="statusClass()">{{ dictConvert('WalletStatus', wallet.status) }}</span></a-descriptions-item>
+        <a-descriptions-item label="创建时间">{{ wallet.createTime }}</a-descriptions-item>
       </a-descriptions>
     </a-spin>
     <template #footer>
@@ -37,51 +25,58 @@
 </template>
 
 <script setup lang="ts">
-  import { get, Wallet } from './Wallet.api'
-  import { $ref } from 'vue/macros'
-  import { BasicModal } from '/@/components/Modal'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useDict } from '/@/hooks/bootx/useDict'
+import { get, Wallet } from './Wallet.api'
+import { $ref } from 'vue/macros'
+import { BasicModal } from '/@/components/Modal'
+import useFormEdit from '/@/hooks/bootx/useFormEdit'
+import { useDict } from '/@/hooks/bootx/useDict'
 
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
+const {
+  initFormEditType,
+  handleCancel,
+  search,
+  labelCol,
+  wrapperCol,
+  modalWidth,
+  title,
+  confirmLoading,
+  visible,
+  editable,
+  showable,
+  formEditType,
+} = useFormEdit()
+const { dictConvert } = useDict()
 
-  let loading = $ref(false)
-  let wallet = $ref<Wallet>({})
+let loading = $ref(false)
+let wallet = $ref<Wallet>({})
 
-  /**
-   * 入口
-   */
-  function init(record: Wallet) {
-    visible.value = true
-    wallet = record
-    initData(record.id as string)
+/**
+ * 入口
+ */
+function init(record: Wallet) {
+  visible.value = true
+  wallet = record
+  initData(record.id as string)
+}
+function statusClass()  {
+  console.log('statusClass')
+  if (wallet.status == 'normal') {
+    return { color: 'green' }
+  } else {
+    return { color: 'red' }
   }
+}
+/**
+ * 初始化数据
+ */
+async function initData(walletId: string) {
+  loading = true
+  const { data } = await get(walletId)
+  loading = false
+  wallet = data
+}
 
-  /**
-   * 初始化数据
-   */
-  async function initData(walletId: string) {
-    loading = true
-    const { data } = await get(walletId)
-    loading = false
-    wallet = data
-  }
-
-  defineExpose({ init })
+defineExpose({ init })
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/views/payment/channel/wallet/manager/WalletList.vue b/src/views/payment/channel/wallet/manager/WalletList.vue
index 987ac0072958ef2a0766debe9acc17c64ee7e9d5..4feeb3bdf72403cfd2eb8517769b2fa6873340aa 100644
--- a/src/views/payment/channel/wallet/manager/WalletList.vue
+++ b/src/views/payment/channel/wallet/manager/WalletList.vue
@@ -12,6 +12,7 @@
       <vxe-table
         row-id="id"
         ref="xTable"
+        :cell-style="cellStyle"
         :data="pagination.records"
         :loading="loading"
         :sort-config="{ remote: true, trigger: 'cell' }"
@@ -24,7 +25,7 @@
         <vxe-column field="balance" title="余额(分)" sortable />
         <vxe-column field="status" title="状态">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('WalletStatus', row.status) || '无' }}</a-tag>
+            {{ dictConvert('WalletStatus', row.status) || '无' }}
           </template>
         </vxe-column>
         <vxe-column field="createTime" title="创建时间" sortable />
@@ -69,7 +70,6 @@
   import { VxeTableInstance, VxeToolbarInstance, VxePager, VxeTable, VxeToolbar } from 'vxe-table'
   import ALink from '/@/components/Link/Link.vue'
   import WalletCreateModel from './WalletCreateModel.vue'
-  import WalletRecordList from '../record/WalletRecordList.vue'
   import WalletRechargeModel from './WalletRechargeModel.vue'
   import WalletDeductModel from './WalletDeductModel.vue'
   import WalletInfo from './WalletInfo.vue'
@@ -152,6 +152,18 @@
   function showRecord(record) {
     walletRecordList.init(record)
   }
+  function cellStyle({ row, column }) {
+    if (column.field == 'status') {
+      if (row.status == 'normal') {
+        return { color: 'green' }
+      }
+      if (row.status == 'forbidden') {
+        return { color: 'red' }
+      }
+      return { color: 'gray' }
+    }
+
+  }
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/views/payment/channel/wallet/record/WalletRecord.api.ts b/src/views/payment/channel/wallet/record/WalletRecord.api.ts
deleted file mode 100644
index 28826ad4b165533235e39c50efb5bb28d0aef0df..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/wallet/record/WalletRecord.api.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result, PageResult } from '/#/axios'
-import { BaseEntity } from '/#/web'
-
-/**
- * 分页
- */
-export function page(params) {
-  return defHttp.get<Result<PageResult<WalletRecord>>>({
-    url: '/wallet/record/page',
-    params,
-  })
-}
-
-/**
- * 获取详情
- */
-export function get(id) {
-  return defHttp.get<Result<WalletRecord>>({
-    url: '/wallet/record/findById',
-    params: { id },
-  })
-}
-
-/**
- * 钱包记录
- */
-export interface WalletRecord extends BaseEntity {
-  // 钱包id
-  walletId?: string
-  // 标题
-  title?: string
-  // 业务类型
-  type?: string
-  // 金额
-  amount?: string
-  // 变动之前的金额
-  oldAmount?: string
-  // 变动之后的金额
-  newAmount?: string
-  // 交易订单号
-  orderId?: string
-  // 终端ip
-  ip?: string
-}
diff --git a/src/views/payment/channel/wallet/record/WalletRecordInfo.vue b/src/views/payment/channel/wallet/record/WalletRecordInfo.vue
deleted file mode 100644
index 7672f5e2b3402607cf9d74fcc0b3e0712f9321f2..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/wallet/record/WalletRecordInfo.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <basic-modal
-    title="查看"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="标题">
-          {{ walletRecord.title }}
-        </a-descriptions-item>
-        <a-descriptions-item label="金额(分)">
-          {{ walletRecord.amount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="变动前金额(分)">
-          {{ walletRecord.oldAmount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="变动后金额(分)">
-          {{ walletRecord.newAmount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="交易订单号">
-          {{ walletRecord.orderId }}
-        </a-descriptions-item>
-        <a-descriptions-item label="业务类型">
-          <a-tag>{{ dictConvert('WalletRecordType', walletRecord.type) }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="记录时间">
-          {{ walletRecord.createTime }}
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-spin>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-
-<script setup lang="ts">
-  import { get, WalletRecord } from './WalletRecord.api'
-  import { $ref } from 'vue/macros'
-  import { BasicModal } from '/@/components/Modal'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useDict } from '/@/hooks/bootx/useDict'
-
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-
-  let loading = $ref(false)
-  let walletRecord = $ref<WalletRecord>({})
-
-  /**
-   * 入口
-   */
-  function init(record: WalletRecord) {
-    visible.value = true
-    walletRecord = record
-    initData(record.id as string)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData(walletId) {
-    loading = true
-    const { data } = await get(walletId)
-    loading = false
-    walletRecord = data
-  }
-
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/wallet/record/WalletRecordList.vue b/src/views/payment/channel/wallet/record/WalletRecordList.vue
deleted file mode 100644
index fc2c2f44def65a0495e05f29ba4715f0944c741c..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/wallet/record/WalletRecordList.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-  <basic-drawer forceRender v-bind="$attrs" title="钱包记录" width="60%" :visible="visible" @close="visible = false">
-    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table
-      row-id="id"
-      ref="xTable"
-      :data="pagination.records"
-      :loading="loading"
-      :sort-config="{ remote: true, trigger: 'cell' }"
-      @sort-change="sortChange"
-    >
-      <vxe-column type="seq" title="序号" width="60" />
-      <vxe-column field="title" title="标题" />
-      <vxe-column field="type" title="类型">
-        <template #default="{ row }">
-          <a-tag>{{ dictConvert('WalletRecordType', row.type) }}</a-tag>
-        </template>
-      </vxe-column>
-      <vxe-column field="amount" title="金额" />
-      <vxe-column field="orderId" title="订单号" />
-      <vxe-column field="createTime" title="记录时间" sortable />
-      <vxe-column fixed="right" width="50" :showOverflow="false" title="操作">
-        <template #default="{ row }">
-          <a-link @click="show(row)">查看</a-link>
-        </template>
-      </vxe-column>
-    </vxe-table>
-    <vxe-pager
-      size="medium"
-      :loading="loading"
-      :current-page="pagination.current"
-      :page-size="pagination.size"
-      :total="pagination.total"
-      @page-change="handleTableChange"
-    />
-    <wallet-record-info ref="walletRecordInfo" />
-  </basic-drawer>
-</template>
-
-<script setup lang="ts">
-  import { computed, onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { page, WalletRecord } from './WalletRecord.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import { Wallet } from '/@/views/payment/channel/wallet/manager/Wallet.api'
-  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
-  import WalletRecordInfo from './WalletRecordInfo.vue'
-  import ALink from "/@/components/Link/Link.vue";
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
-
-  let visible = $ref<boolean>(false)
-  let wallet = $ref<Wallet>({})
-  let walletRecordInfo = $ref<any>()
-
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-
-  onMounted(() => {
-    vxeBind()
-  })
-
-  /**
-   * 绑定
-   */
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
-
-  /**
-   * 初始化
-   */
-  function init(record: Wallet) {
-    visible = true
-    wallet = record
-    queryPage()
-  }
-
-  /**
-   * 查看
-   */
-  function show(record) {
-    walletRecordInfo.init(record)
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-      ...sortParam,
-      walletId: wallet.id,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-    return Promise.resolve()
-  }
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts b/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts
deleted file mode 100644
index 28cdaa2f07175d52ff2a8d67c58392e19e510d9c..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-import { Result, PageResult } from '/#/axios'
-import { BaseEntity } from '/#/web'
-
-/**
- * 分页
- */
-export function page(params) {
-  return defHttp.get<Result<PageResult<WechatPayRecord>>>({
-    url: '/wechat/pay/record/page',
-    params,
-  })
-}
-
-/**
- * 获取详情
- */
-export function get(id) {
-  return defHttp.get<Result<WechatPayRecord>>({
-    url: '/wechat/pay/record/findById',
-    params: { id },
-  })
-}
-
-/**
- * 记录
- */
-export interface WechatPayRecord extends BaseEntity {
-  // 标题
-  title?: string
-  // 业务类型
-  type?: string
-  // 金额
-  amount?: string
-  // 交易订单号
-  orderId?: string
-  // 交易订单号
-  gatewayOrderNo?: string
-  // 终端ip
-  ip?: string
-  // 网关时间
-  gatewayTime?: string
-}
diff --git a/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue b/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
deleted file mode 100644
index 16b3097eaf4a5316334ba4ca94ee5b96619ed9f8..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <basic-modal
-    title="查看"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="标题">
-          {{ wechatPayRecord.title }}
-        </a-descriptions-item>
-        <a-descriptions-item label="金额(分)">
-          {{ wechatPayRecord.amount }}
-        </a-descriptions-item>
-        <a-descriptions-item label="本地订单号">
-          {{ wechatPayRecord.orderId }}
-        </a-descriptions-item>
-        <a-descriptions-item label="网关订单号">
-          {{ wechatPayRecord.gatewayOrderNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="业务类型">
-          <a-tag>{{ dictConvert('WechatPayRecordType', wechatPayRecord.type) }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="网关时间">
-          {{ wechatPayRecord.gatewayTime }}
-        </a-descriptions-item>
-        <a-descriptions-item label="记录时间">
-          {{ wechatPayRecord.createTime }}
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-spin>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-
-<script setup lang="ts">
-  import { get, WechatPayRecord } from './WechatPayRecord.api'
-  import { $ref } from 'vue/macros'
-  import { BasicModal } from '/@/components/Modal'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useDict } from '/@/hooks/bootx/useDict'
-
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-
-  let loading = $ref(false)
-  let wechatPayRecord = $ref<WechatPayRecord>({})
-
-  /**
-   * 入口
-   */
-  function init(record: WechatPayRecord) {
-    visible.value = true
-    wechatPayRecord = record
-    initData(record.id as string)
-  }
-
-  /**
-   * 初始化数据
-   */
-  async function initData(wechatPayId) {
-    loading = true
-    const { data } = await get(wechatPayId)
-    loading = false
-    wechatPayRecord = data
-  }
-
-  defineExpose({ init })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/channel/wechat/record/WechatPayRecordList.vue b/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
deleted file mode 100644
index 2457cba58efdbf61e65b85ae315c0b21ab3976c8..0000000000000000000000000000000000000000
--- a/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <div>
-    <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" :default-item-count="3" @query="queryPage" @reset="resetQueryParams" />
-    </div>
-    <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-      <vxe-table
-        row-id="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="title" title="标题" />
-        <vxe-column field="type" title="类型">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('WechatPayRecordType', row.type) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="amount" title="金额" />
-        <vxe-column field="orderId" title="本地订单ID" width="170" />
-        <vxe-column field="gatewayOrderNo" title="网关订单号" width="170" />
-        <vxe-column field="gatewayTime" title="网关时间" sortable />
-        <vxe-column fixed="right" width="50" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-          </template>
-        </vxe-column>
-      </vxe-table>
-      <vxe-pager
-        size="medium"
-        :loading="loading"
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        @page-change="handleTableChange"
-      />
-      <wechatPay-record-info ref="wechatPayRecordInfo" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-  import { computed, onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { page } from './WechatPayRecord.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import WechatPayRecordInfo from './WechatPayRecordInfo.vue'
-  import ALink from '/@/components/Link/Link.vue'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
-  import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
-  import { LabeledValue } from 'ant-design-vue/lib/select'
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
-
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-  const wechatPayRecordInfo = $ref<any>()
-
-  let recordTypeList = $ref<LabeledValue[]>([])
-
-  const fields = computed(() => {
-    return [
-      { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
-      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入完整本地订单ID' },
-      { field: 'type', type: LIST, name: '记录类型', placeholder: '请选择记录类型', selectList: recordTypeList },
-      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
-    ] as QueryField[]
-  })
-  onMounted(() => {
-    vxeBind()
-    initData()
-    queryPage()
-  })
-
-  /**
-   * 绑定
-   */
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
-  /**
-   * 初始化数据
-   */
-  async function initData() {
-    recordTypeList = await dictDropDown('WechatPayRecordType')
-  }
-
-  /**
-   * 查看
-   */
-  function show(record) {
-    wechatPayRecordInfo.init(record)
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-      ...sortParam,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-    return Promise.resolve()
-  }
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/order/pay/PayChannelOrderInfo.vue b/src/views/payment/order/pay/PayChannelOrderInfo.vue
deleted file mode 100644
index ed56a90291b366a8fe0752739aa053650fc2f9c1..0000000000000000000000000000000000000000
--- a/src/views/payment/order/pay/PayChannelOrderInfo.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <basic-modal
-    title="通道支付订单详情"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="750"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-      <a-descriptions-item label="通道支付单ID">
-        {{ form.id }}
-      </a-descriptions-item>
-      <a-descriptions-item label="支付通道">
-        {{ dictConvert('PayChannel', form.channel) }}
-      </a-descriptions-item>
-      <a-descriptions-item label="异步支付">
-        <span v-if="form.async" style="color: green">是</span>
-        <span v-else style="color: red">否</span>
-      </a-descriptions-item>
-      <a-descriptions-item label="支付方式">
-        {{ dictConvert('PayWay', form.payWay) }}
-      </a-descriptions-item>
-      <a-descriptions-item label="订单金额">
-        {{ form.amount }}
-      </a-descriptions-item>
-      <a-descriptions-item label="支付状态">
-        <span :style="dynamicStyle(form.status)"> {{ dictConvert('PayStatus', form.status) }}</span>
-      </a-descriptions-item>
-      <a-descriptions-item label="支付时间">
-        {{ form.payTime }}
-      </a-descriptions-item>
-    </a-descriptions>
-
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-<script setup lang="ts">
-  import { $ref } from 'vue/macros'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { FormInstance } from 'ant-design-vue/lib/form'
-  import { BasicModal } from '/@/components/Modal'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import { getChannel, PayChannelOrder } from '/@/views/payment/order/pay/PayOrder.api'
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-  // 表单
-  const formRef = $ref<FormInstance>()
-  let form = $ref<PayChannelOrder>({})
-
-  // 事件
-  const emits = defineEmits(['ok'])
-  // 入口
-  function init(record) {
-    visible.value = true
-    confirmLoading.value = true
-    getChannel(record.id).then(({ data }) => {
-      form = data
-      confirmLoading.value = false
-    })
-  }
-  function dynamicStyle(item: string) {
-    if (item == 'success') {
-      return { color: 'green' }
-    }
-    if (item == 'fail') {
-      return { color: 'red' }
-    }
-    if (item == 'progress') {
-      return { color: 'orange' }
-    }
-    if (item == 'close') {
-      return { color: 'gray' }
-    }
-    return { color: 'red' }
-  }
-  defineExpose({
-    init,
-  })
-</script>
-<style scoped lang="less"></style>
diff --git a/src/views/payment/order/pay/PayChannelOrderList.vue b/src/views/payment/order/pay/PayChannelOrderList.vue
deleted file mode 100644
index 787db63cd15bce87ed76cc44dfb65627e405c74d..0000000000000000000000000000000000000000
--- a/src/views/payment/order/pay/PayChannelOrderList.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <basic-drawer forceRender v-bind="$attrs" title="通道订单列表" width="60%" :visible="visible" @close="visible = false">
-    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table row-id="id" ref="xTable" :data="records" :loading="loading" :cell-style="cellStyle">
-      <vxe-column type="seq" width="60" />
-      <vxe-column field="id" title="通道支付单ID" width="170" />
-      <vxe-column field="channel" title="支付通道">
-        <template #default="{ row }">
-          {{ dictConvert('PayChannel', row.channel) }}
-        </template>
-      </vxe-column>
-      <vxe-column field="payWay" title="支付方式">
-        <template #default="{ row }">
-          {{ dictConvert('PayWay', row.payWay) }}
-        </template>
-      </vxe-column>
-      <vxe-column field="amount" title="订单金额" />
-      <vxe-column field="refundableBalance" title="可退款金额" />
-      <vxe-column field="async" title="异步支付">
-        <template #default="{ row }">
-          <span v-if="row.async" style="color: green">是</span>
-          <span v-else style="color: red">否</span>
-        </template>
-      </vxe-column>
-      <vxe-column field="status" title="支付状态">
-        <template #default="{ row }">
-          {{ dictConvert('PayStatus', row.status) }}
-        </template>
-      </vxe-column>
-      <vxe-column field="payTime" title="支付时间" />
-      <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
-        <template #default="{ row }">
-          <span>
-            <a href="javascript:" @click="show(row)">查看</a>
-          </span>
-        </template>
-      </vxe-column>
-    </vxe-table>
-    <pay-channel-order-info ref="payChannelOrderInfo" />
-  </basic-drawer>
-</template>
-
-<script setup lang="ts">
-  import { nextTick } from 'vue'
-  import { $ref } from 'vue/macros'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import { listByChannel, PayChannelOrder, PayOrder } from '/@/views/payment/order/pay/PayOrder.api'
-  import PayChannelOrderInfo from './PayChannelOrderInfo.vue'
-
-  // 使用hooks
-  const { resetQueryParams, model, loading } = useTablePage(queryPage)
-  const { notification, createMessage } = useMessage()
-  const { dictDropDown, dictConvert } = useDict()
-
-  let visible = $ref(false)
-  let payOrder = $ref<PayOrder>()
-  let records = $ref<PayChannelOrder[]>([])
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-  const payChannelOrderInfo = $ref<any>()
-
-  nextTick(() => {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  })
-
-  /**
-   * 入口
-   * @param record
-   */
-  function init(record) {
-    visible = true
-    payOrder = record
-    queryPage()
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    listByChannel(payOrder?.id).then(({ data }) => {
-      records = data
-      loading.value = false
-    })
-  }
-  /**
-   * 查看
-   */
-  function show(record) {
-    payChannelOrderInfo.init(record)
-  }
-
-  function cellStyle({ row, column }) {
-    if (column.field == 'status') {
-      if (row.status == 'success') {
-        return { color: 'green' }
-      }
-      if (row.status == 'fail') {
-        return { color: 'red' }
-      }
-      if (row.status == 'progress') {
-        return { color: 'orange' }
-      }
-      if (row.status == 'close') {
-        return { color: 'gray' }
-      }
-      return { color: 'red' }
-    }
-    if (column.field == 'asyncPay') {
-      if (row.asyncPay) {
-        return { color: 'green' }
-      } else {
-        return { color: 'gray' }
-      }
-    }
-    if (column.field == 'combinationPay') {
-      if (row.combinationPay) {
-        return { color: 'green' }
-      } else {
-        return { color: 'gray' }
-      }
-    }
-  }
-  defineExpose({
-    init,
-  })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/order/pay/PayOrder.api.ts b/src/views/payment/order/pay/PayOrder.api.ts
index 78bf76d8b909016300698ae03c4094c4aaa81572..a3cf2522f58f70e8091d24473c3f2b2ee657f513 100644
--- a/src/views/payment/order/pay/PayOrder.api.ts
+++ b/src/views/payment/order/pay/PayOrder.api.ts
@@ -1,8 +1,6 @@
 import { defHttp } from '/@/utils/http/axios'
 import { PageResult, Result } from '/#/axios'
 import { BaseEntity } from '/#/web'
-import { RefundableInfo } from '/@/views/payment/order/refund/RefundOrder.api'
-import { PaySyncResult } from '/@/views/payment/record/sync/PaySyncRecord.api'
 
 /**
  * 分页
@@ -17,7 +15,7 @@ export function page(params) {
 /**
  * 获取订单
  */
-export function getOrder(id) {
+export function getOrder(id: number) {
   return defHttp.get<Result<PayOrder>>({
     url: '/order/pay/findById',
     params: { id },
@@ -25,62 +23,52 @@ export function getOrder(id) {
 }
 
 /**
- * 获取订单扩展信息
- */
-export function getOrderExtra(id) {
-  return defHttp.get<Result<PayOrderExtra>>({
-    url: '/order/pay/getExtraById',
-    params: { id },
-  })
-}
-
-/**
- * 获取付通道订单列表
- */
-export function listByChannel(paymentId) {
-  return defHttp.get<Result<PayChannelOrder[]>>({
-    url: '/order/pay/listByChannel',
-    params: { paymentId },
-  })
-}
-
-/**
- * 获取付通道订单列表
+ * 获取订单
  */
-export function getChannel(id) {
-  return defHttp.get<Result<PayChannelOrder>>({
-    url: '/order/pay/getChannel',
-    params: { id },
+export function getOrderByOrderNo(orderNo: string) {
+  return defHttp.get<Result>({
+    url: '/order/pay/findByOrderNo',
+    params: { orderNo },
   })
 }
 
 /**
- * 同步支付状态
+ * 根据订单号同步支付状态
  */
-export function syncById(id) {
-  return defHttp.post<Result<PaySyncResult>>({
-    url: '/order/pay/syncById',
-    params: { id },
+export function syncByOrderNo(orderNo: string) {
+  return defHttp.post<Result>({
+    url: '/order/pay/syncByOrderNo',
+    params: { orderNo },
   })
 }
 
 /**
  * 关闭支付记录
  */
-export function close(id) {
+export function close(orderNo) {
   return defHttp.post<Result<void>>({
     url: '/order/pay/close',
-    params: { id },
+    params: { orderNo },
   })
 }
 
 /**
  * 触发分账
  */
-export function allocationById(id) {
+export function allocationByOrderNo(orderNo) {
   return defHttp.post<Result<void>>({
     url: '/order/pay/allocation',
-    params: { id },
+    params: { orderNo },
+  })
+}
+
+/**
+ * 获取汇总金额
+ */
+export function getTotalAmount(param) {
+  return defHttp.get<Result<number>>({
+    url: '/order/pay/getTotalAmount',
+    params: param,
   })
 }
 
@@ -88,76 +76,56 @@ export function allocationById(id) {
  * 支付记录
  */
 export interface PayOrder extends BaseEntity {
-  // 关联的业务号
-  businessNo?: string
   // 标题
   title?: string
-  // 是否是异步支付
-  asyncPay?: boolean
-  // 异步支付通道
-  asyncChannel?: boolean
-  // 是否是组合支付
-  combinationPay?: boolean
-  // 关联网关支付ID
-  gatewayOrderNo?: number
+  // 商户订单号
+  bizOrderNo?: string
+  // 支付订单号
+  orderNo?: string
+  // 三方系统交易号
+  outOrderNo?: string
+  // 描述
+  description?: any
+  // 是否支持分账
+  allocation?: boolean
+  // 支付通道
+  channel?: string
+  // 支付方式
+  method?: string
   // 金额
   amount?: number
   // 可退款余额
   refundableBalance?: number
   // 支付状态
-  status?: number
+  status?: string
+  // 分账状态
+  allocationStatus?: string
   // 支付时间
   payTime?: string
   // 过期时间
   expiredTime?: string
+  // 关闭时间
+  closeTime?: string
+  // 错误码
+  errorCode?: string
+  // 错误信息
+  errorMsg?: string
 }
 
 /**
  * 支付扩展信息
  */
 export interface PayOrderExtra {
-  // 描述
-  description?: string
-  // 支付终端ip
-  clientIp?: string
   // 是否不需要异步通知
   notNotify?: string
   // 异步通知地址
   notifyUrl?: string
-  // 签名类型
-  signType?: string
-  // 支付终端ip
-  sign?: string
   // 商户扩展参数
   attach?: string
-  // API版本号
-  apiVersion?: string
+  // 附加参数
+  extraParam?: string
   // 请求时间
   reqTime?: string
-  // 错误码
-  errorCode?: string
-  // 错误信息
-  errorMsg?: string
-}
-
-/**
- * 支付通道信息
- */
-export interface PayChannelOrder extends BaseEntity {
-  // 支付通道
-  channel?: number
-  // 支付方式
-  payWay?: number
-  // 异步支付方式
-  async?: boolean
-  // 金额
-  amount?: number
-  // 可退款金额
-  refundableBalance?: number
-  // 支付状态
-  status?: string
-  // 支付状态
-  payTime?: string
-  // 附加支付参数
-  channelExtra?: string
+  // 支付终端ip
+  clientIp?: string
 }
diff --git a/src/views/payment/order/pay/PayOrderInfo.vue b/src/views/payment/order/pay/PayOrderInfo.vue
index fb4826b98e2e968a95c8157eb782de6c5e088042..a45f2ec5ad8a6a7f95d3d91a94e9293db8f7d6f3 100644
--- a/src/views/payment/order/pay/PayOrderInfo.vue
+++ b/src/views/payment/order/pay/PayOrderInfo.vue
@@ -3,85 +3,76 @@
     title="查看支付单"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="modalWidth"
+    :width="1200"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions title="" :column="{ md: 2, sm: 1, xs: 1 }">
-        <a-descriptions-item label="支付ID">
-          {{ order.id }}
-        </a-descriptions-item>
-        <a-descriptions-item label="业务号">
-          {{ order.businessNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="网关订单号">
-          {{ order.gatewayOrderNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="标题">
+      <a-descriptions title="" bordered>
+        <a-descriptions-item label="标题" :span="1">
           {{ order.title }}
         </a-descriptions-item>
-        <a-descriptions-item label="描述">
-          {{ orderExtra.description }}
-        </a-descriptions-item>
-        <a-descriptions-item label="金额">
-          {{ order.amount }}
+        <a-descriptions-item label="金额(元)">
+          {{ order.amount ? (order.amount / 100).toFixed(2) : 0 }}
         </a-descriptions-item>
-        <a-descriptions-item label="可退余额">
-          {{ order.refundableBalance }}
+        <a-descriptions-item label="可退余额(元)">
+          {{ order.refundableBalance ? (order.refundableBalance / 100).toFixed(2) : 0 }}
         </a-descriptions-item>
         <a-descriptions-item label="支付状态">
-          <a-tag>{{ dictConvert('PayStatus', order.status) }}</a-tag>
+          {{ dictConvert('PayStatus', order.status) }}
         </a-descriptions-item>
-        <a-descriptions-item label="异步支付">
-          {{ order.asyncPay ? '是' : '否' }}
+        <a-descriptions-item :span="2" label="订单号">
+          {{ order.orderNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="组合支付">
-          {{ order.combinationPay ? '是' : '否' }}
+        <a-descriptions-item label="支持分账">
+          {{ order.allocation ? '是' : '否' }}
         </a-descriptions-item>
-        <a-descriptions-item label="异步支付方式">
-          {{ dictConvert('PayChannel', order.asyncChannel) }}
+        <a-descriptions-item label="商户订单号" :span="2">
+          {{ order.bizOrderNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="支付信息">
-          <a-tag v-for="o in orderChannel" :key="o.channel">{{ dictConvert('PayChannel', o.channel) }}: {{ o.amount }}</a-tag>
+        <a-descriptions-item label="分账状态">
+          {{ dictConvert('PayOrderAllocationStatus', order.allocationStatus) || '无' }}
         </a-descriptions-item>
-        <a-descriptions-item label="可退款信息">
-          <a-tag v-for="o in orderChannel" :key="o.channel">{{ dictConvert('PayChannel', o.channel) }}: {{ o.refundableBalance }}</a-tag>
+        <a-descriptions-item label="三方系统交易号" :span="2">
+          {{ order.outOrderNo || '无' }}
         </a-descriptions-item>
-        <a-descriptions-item label="客户IP">
-          {{ orderExtra.clientIp }}
+        <a-descriptions-item v-if="order.errorCode" label="错误编码" :span="1">
+          {{ order.errorCode }}
         </a-descriptions-item>
-        <a-descriptions-item label="错误信息">
-          {{ orderExtra.errorMsg }}
+        <a-descriptions-item v-if="order.errorMsg" label="错误信息" :span="2">
+          {{ order.errorMsg }}
         </a-descriptions-item>
         <a-descriptions-item label="是否通知">
           {{ orderExtra.notNotify ? '否' : '是' }}
         </a-descriptions-item>
-        <a-descriptions-item label="通知地址">
-          {{ orderExtra.notifyUrl }}
-        </a-descriptions-item>
-        <a-descriptions-item label="签名类型">
-          {{ orderExtra.signType }}
+        <a-descriptions-item label="通知地址" :span="2">
+          {{ orderExtra.notifyUrl || '无' }}
         </a-descriptions-item>
-        <a-descriptions-item label="签名">
-          {{ orderExtra.sign }}
+        <a-descriptions-item label="客户IP">
+          {{ orderExtra.clientIp }}
         </a-descriptions-item>
-        <a-descriptions-item label="商户扩展参数">
-          {{ orderExtra.attach }}
+        <a-descriptions-item label="商户扩展参数" :span="2">
+          {{ orderExtra.attach || '无' }}
         </a-descriptions-item>
         <a-descriptions-item label="请求时间">
-          {{ orderExtra.reqTime }}
+          {{ orderExtra.reqTime || '无' }}
         </a-descriptions-item>
         <a-descriptions-item label="支付时间">
-          {{ order.payTime }}
+          {{ order.payTime || '无' }}
         </a-descriptions-item>
         <a-descriptions-item label="过期时间">
-          {{ order.expiredTime }}
+          {{ order.expiredTime || '无' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="关闭时间">
+          {{ order.closeTime || '无' }}
         </a-descriptions-item>
         <a-descriptions-item label="创建时间">
           {{ order.createTime }}
         </a-descriptions-item>
+        <a-descriptions-item label="描述" :span="1">
+          {{ order.description }}
+        </a-descriptions-item>
       </a-descriptions>
     </a-spin>
     <template #footer>
@@ -95,40 +86,21 @@
 <script lang="ts" setup>
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { getOrder, PayOrder, PayOrderExtra, PayChannelOrder, getOrderExtra, listByChannel } from './PayOrder.api'
+  import { PayOrder, PayOrderExtra, getOrderByOrderNo } from './PayOrder.api'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
   const { dictConvert } = useDict()
 
   let order = $ref<PayOrder>({})
   let orderExtra = $ref<PayOrderExtra>({})
-  let orderChannel = $ref<PayChannelOrder[]>([])
   // 入口
-  async function init(id) {
+  async function init(orderNo: string) {
     visible.value = true
     confirmLoading.value = true
-    await getOrder(id).then(({ data }) => {
-      order = data
-    })
-    await getOrderExtra(id).then(({ data }) => {
-      orderExtra = data
-    })
-    await listByChannel(id).then(({ data }) => {
-      orderChannel = data
+    await getOrderByOrderNo(orderNo).then(({ data }) => {
+      order = data.payOrder
+      orderExtra = data.payOrderExtra
     })
     confirmLoading.value = false
   }
diff --git a/src/views/payment/order/pay/PayOrderList.vue b/src/views/payment/order/pay/PayOrderList.vue
index 038c98c082323f370d4ac9658a6dddf1cc20c00a..f31c413e3c62ffca2b9f867b4c373a059557dfd2 100644
--- a/src/views/payment/order/pay/PayOrderList.vue
+++ b/src/views/payment/order/pay/PayOrderList.vue
@@ -4,7 +4,11 @@
       <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
     </div>
     <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+        <template #buttons>
+          <span style="font-size: 18px">收款金额: {{ totalAmount ? (totalAmount / 100).toFixed(2) : 0 }}元</span>
+        </template>
+      </vxe-toolbar>
       <vxe-table
         row-id="id"
         ref="xTable"
@@ -15,43 +19,46 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="businessNo" title="业务号" width="180" />
-        <vxe-column field="title" title="标题" width="220" />
-        <vxe-column field="amount" title="金额(分)" width="120" sortable />
-        <vxe-column field="refundableBalance" title="可退余额(分)" width="120" sortable />
-        <vxe-column field="status" title="支付状态" width="120">
-          <template #default="{ row }">{{ dictConvert('PayStatus', row.status) }}</template>
+        <vxe-column field="orderNo" title="订单号" :min-width="220">
+          <template #default="{ row }">
+            <a @click="show(row)">
+              {{ row.orderNo }}
+            </a>
+          </template>
         </vxe-column>
-        <vxe-column field="createTime" title="创建时间" sortable width="220" />
-        <vxe-column field="id" title="支付ID" sortable width="220" />
-
-        <vxe-column field="asyncPay" title="异步支付" width="120">
-          <template #default="{ row }">{{ row.asyncPay ? '是' : '否' }}</template>
+        <vxe-column field="title" title="标题" :min-width="220" />
+        <vxe-column field="channel" title="支付通道" :min-width="120">
+          <template #default="{ row }">
+            {{ dictConvert('PayChannel', row.channel) }}
+          </template>
+        </vxe-column>
+        <vxe-column field="bizOrderNo" title="商户订单号" :min-width="220" />
+        <vxe-column field="amount" title="金额(元)" :min-width="120" sortable>
+          <template #default="{ row }"> {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }} </template>
         </vxe-column>
-        <vxe-column field="combinationPay" title="组合支付" width="120">
-          <template #default="{ row }">{{ row.combinationPay ? '是' : '否' }}</template>
+        <vxe-column field="refundableBalance" title="可退余额(元)" width="120" sortable>
+          <template #default="{ row }"> {{ row.refundableBalance ? (row.refundableBalance / 100).toFixed(2) : 0 }} </template>
         </vxe-column>
-        <vxe-column field="asyncChannel" title="异步支付方式" width="160">
-          <template #default="{ row }">{{ dictConvert('PayChannel', row.asyncChannel) || '无' }}</template>
+        <vxe-column field="status" title="支付状态" width="120">
+          <template #default="{ row }">{{ dictConvert('PayStatus', row.status) }}</template>
         </vxe-column>
-        <vxe-column field="allocation" title="分账" width="160">
+
+        <vxe-column field="allocation" title="分账" :min-width="160">
           <template #default="{ row }">
             <a-tag v-if="row.allocation" color="green">支持</a-tag>
             <a-tag v-else color="red">不支持</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="allocation" title="分账状态" width="160">
+        <vxe-column field="allocation" title="分账状态" :min-width="160">
           <template #default="{ row }">
             {{ dictConvert('PayOrderAllocationStatus', row.allocationStatus) }}
           </template>
         </vxe-column>
-        <vxe-column field="expiredTime" title="过期时间" sortable width="220" />
-        <vxe-column fixed="right" width="200" :showOverflow="false" title="操作">
+        <vxe-column field="createTime" title="创建时间" sortable :min-width="220" />
+        <vxe-column fixed="right" width="120" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
             <a-divider type="vertical" />
-            <a-link @click="showChannel(row)">通道订单</a-link>
-            <a-divider type="vertical" />
             <a-dropdown>
               <a>
                 更多
@@ -62,13 +69,13 @@
                   <a-menu-item>
                     <a-link @click="sync(row)">同步</a-link>
                   </a-menu-item>
-                  <a-menu-item v-if="[PayStatus.PROGRESS].includes(row.status)">
+                  <a-menu-item v-if="[payStatus.PROGRESS].includes(row.status)">
                     <a-link @click="closeOrder(row)" danger>关闭</a-link>
                   </a-menu-item>
                   <a-menu-item v-if="row.allocationStatus === 'waiting'">
                     <a-link @click="allocation(row)">分账</a-link>
                   </a-menu-item>
-                  <a-menu-item v-if="[PayStatus.SUCCESS, PayStatus.PARTIAL_REFUND].includes(row.status) && row.refundableBalance > 0">
+                  <a-menu-item v-if="[payStatus.SUCCESS, payStatus.PARTIAL_REFUND].includes(row.status) && row.refundableBalance > 0">
                     <a-link @click="refund(row)" danger>退款</a-link>
                   </a-menu-item>
                 </a-menu>
@@ -86,7 +93,6 @@
         @page-change="handleTableChange"
       />
       <pay-order-info ref="payOrderInfo" />
-      <pay-channel-order-list ref="payChannelOrderList" />
       <refund-model ref="refundModel" @ok="queryPage" />
     </div>
   </div>
@@ -95,7 +101,7 @@
 <script lang="ts" setup>
   import { computed, onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { allocationById, close, page, syncById } from './PayOrder.api'
+  import { allocationByOrderNo, close, getTotalAmount, page, syncByOrderNo } from './PayOrder.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import PayOrderInfo from './PayOrderInfo.vue'
   import RefundModel from './RefundModel.vue'
@@ -105,28 +111,38 @@
   import { useDict } from '/@/hooks/bootx/useDict'
   import { VxeTableInstance, VxeToolbarInstance, VxePager, VxeTable, VxeToolbar } from 'vxe-table'
   import ALink from '/@/components/Link/Link.vue'
-  import { PayStatus } from '/@/enums/payment/PayStatus'
+  import { payStatus } from '/@/enums/payment/PayStatus'
   import { LabeledValue } from 'ant-design-vue/lib/select'
-  import PayChannelOrderList from './PayChannelOrderList.vue'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, sortChange, resetQueryParams, pagination, pages, sortParam, model, loading } =
     useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
+  const { createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
-  let cayChannelList = $ref<LabeledValue[]>([])
+  let channelList = $ref<LabeledValue[]>([])
+  let methodList = $ref<LabeledValue[]>([])
   let payStatusList = $ref<LabeledValue[]>([])
 
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'id', type: STRING, name: '支付ID', placeholder: '请输入完整支付ID' },
-      { field: 'businessNo', type: STRING, name: '业务号', placeholder: '请输入业务号' },
-      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
+      { field: 'orderNo', type: STRING, name: '订单号', placeholder: '请输入支付订单号' },
+      { field: 'bizOrderNo', type: STRING, name: '商户订单号', placeholder: '请输入商户订单号' },
+      { field: 'outOrderNo', type: STRING, name: '通道订单号', placeholder: '请输入外部三方支付系统中的订单号' },
       { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
+      {
+        field: 'allocation',
+        name: '支持分账',
+        type: LIST,
+        selectList: [
+          { label: '支持', value: true },
+          { label: '不支持', value: false },
+        ],
+      },
+      { field: 'channel', name: '支付通道', type: LIST, selectList: channelList },
+      { field: 'method', name: '支付方式', type: LIST, selectList: methodList },
       { field: 'errorCode', name: '错误码', type: STRING },
-      { field: 'asyncChannel', name: '异步支付方式', type: LIST, selectList: cayChannelList },
       { field: 'status', name: '支付状态', type: LIST, selectList: payStatusList },
     ] as QueryField[]
   })
@@ -134,8 +150,8 @@
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
   const payOrderInfo = $ref<any>()
-  const payChannelOrderList = $ref<any>()
   const refundModel = $ref<any>()
+  let totalAmount = $ref<number>(0.0)
 
   onMounted(() => {
     initData()
@@ -150,14 +166,16 @@
    * 初始化数据
    */
   async function initData() {
-    cayChannelList = await dictDropDown('AsyncChannel')
+    channelList = await dictDropDown('PayChannel')
     payStatusList = await dictDropDown('PayStatus')
+    methodList = await dictDropDown('PayMethod')
   }
   /**
    * 分页查询
    */
   function queryPage() {
     loading.value = true
+    // 查询列表
     page({
       ...model.queryParam,
       ...pages,
@@ -165,19 +183,20 @@
     }).then(({ data }) => {
       pageQueryResHandel(data)
     })
+    // 汇总数据
+    getTotalAmount({
+      ...model.queryParam,
+    }).then(({ data }) => {
+      totalAmount = data
+    })
+    return Promise.resolve()
   }
 
   /**
    * 查看
    */
   function show(record) {
-    payOrderInfo.init(record.id)
-  }
-  /**
-   * 查看
-   */
-  function showChannel(record) {
-    payChannelOrderList.init(record)
+    payOrderInfo.init(record.orderNo)
   }
 
   /**
@@ -190,10 +209,8 @@
       content: '是否同步支付信息',
       onOk: () => {
         loading.value = true
-        syncById(record.id).then(({ data }) => {
-          // TODO 后期可以根据返回结果进行相应的处理
+        syncByOrderNo(record.orderNo).then(({ data }) => {
           createMessage.success('同步成功')
-          console.log(data)
           queryPage()
         })
       },
@@ -208,7 +225,7 @@
       title: '警告',
       content: '是否关闭支付订单',
       onOk: () => {
-        close(record.id).then(() => {
+        close(record.orderNo).then(() => {
           createMessage.success('关闭成功')
           queryPage()
         })
@@ -231,7 +248,7 @@
       title: '警告',
       content: '是否触发该订单的分账操作',
       onOk: () => {
-        allocationById(record.id).then(() => {
+        allocationByOrderNo(record.orderNo).then(() => {
           createMessage.success('分账请求已发送')
           queryPage()
         })
diff --git a/src/views/payment/order/pay/RefundModel.vue b/src/views/payment/order/pay/RefundModel.vue
index 8017d826a4bd750031975feaceb3fb8a7c0a6684..f88e3e806e4d26a15b0215525ff22e54abed8a22 100644
--- a/src/views/payment/order/pay/RefundModel.vue
+++ b/src/views/payment/order/pay/RefundModel.vue
@@ -8,12 +8,22 @@
     :mask-closable="showable"
     @cancel="handleCancel"
   >
-    <a-form ref="formRef" :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <template :key="o.channel" v-for="o in form.refundChannels">
-        <a-form-item :label="dictConvert('PayChannel', o.channel)" name="name">
-          <a-input-number :min="0" :max="o.maxAmount" :precision="0" v-model:value="o.amount" />
-        </a-form-item>
-      </template>
+    <a-form
+      ref="formRef"
+      :model="form"
+      :label-col="labelCol"
+      :rules="{ amount: [{ required: true, message: '请输入退款金额' }] }"
+      :wrapper-col="wrapperCol"
+    >
+      <a-form-item label="标题">
+        {{ order.title }}
+      </a-form-item>
+      <a-form-item label="订单号">
+        {{ order.orderNo }}
+      </a-form-item>
+      <a-form-item label="退款金额" name="amount">
+        <a-input-number :min="0.01" :max="order.refundableBalance as number / 100" :precision="2" v-model:value="form.amount" />
+      </a-form-item>
       <a-form-item label="原因" name="reason">
         <a-textarea v-model:value="form.reason" :rows="3" />
       </a-form-item>
@@ -28,7 +38,6 @@
 </template>
 
 <script lang="ts" setup>
-  import { listByChannel } from './PayOrder.api'
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
   import { useDict } from '/@/hooks/bootx/useDict'
@@ -37,32 +46,21 @@
   import { FormInstance } from 'ant-design-vue/lib/form'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { nextTick } from 'vue'
+  import { getOrder, PayOrder } from './PayOrder.api'
 
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
+  const { handleCancel, labelCol, wrapperCol, modalWidth, confirmLoading, visible, showable } = useFormEdit()
   const { createMessage, createConfirm } = useMessage()
-  const { dictConvert } = useDict()
+
+  let order = $ref<PayOrder>({})
 
   const formRef = $ref<FormInstance>()
   let form = $ref({
-    // 支付id
-    paymentId: '',
+    // 订单号
+    orderNo: '',
     // 原因
     reason: '',
-    // 可退款明细
-    refundChannels: [] as any,
+    // 退款金额
+    amount: 0.01,
   })
   const emits = defineEmits(['ok'])
 
@@ -73,15 +71,10 @@
     resetForm()
     confirmLoading.value = true
     visible.value = true
-    form.paymentId = id
-    listByChannel(id).then(({ data }) => {
-      form.refundChannels = data.map((item) => {
-        return {
-          channel: item.channel,
-          amount: item.refundableBalance,
-          maxAmount: item.refundableBalance,
-        }
-      })
+    getOrder(id).then(({ data }) => {
+      order = data
+      form.orderNo = data.orderNo as string
+      form.amount = (data.refundableBalance as number) / 100.0
       confirmLoading.value = false
     })
   }
@@ -96,7 +89,11 @@
       content: '确实要申请退款!',
       onOk: () => {
         confirmLoading.value = true
-        refund(form).then(() => {
+        refund({
+          ...form,
+          // 将金额转为分
+          amount: form.amount * 100,
+        }).then(() => {
           visible.value = false
           createMessage.success('退款请求已提交')
           emits('ok')
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue b/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
deleted file mode 100644
index 5258197922462499eb7d2a48ecddc18fad45f32f..0000000000000000000000000000000000000000
--- a/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <basic-drawer forceRender v-bind="$attrs" title="差异明细列表" width="60%" :visible="visible" @close="visible = false">
-    <b-query :query-params="model.queryParam" :default-item-count="3" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
-    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table
-      row-id="id"
-      ref="xTable"
-      :data="pagination.records"
-      :loading="loading"
-      :sort-config="{ remote: true, trigger: 'cell' }"
-      @sort-change="sortChange"
-    >
-      <vxe-column type="seq" title="序号" width="60" />
-      <vxe-column field="title" title="订单标题" />
-      <vxe-column field="orderType" title="订单类型">
-        <template #default="{ row }">
-          <a-tag>{{ dictConvert('ReconcileTrade', row.orderType) }}</a-tag>
-        </template>
-      </vxe-column>
-      <vxe-column field="diffType" title="差异类型">
-        <template #default="{ row }">
-          <a-tag>{{ dictConvert('ReconcileDiffType', row.diffType) }}</a-tag>
-        </template>
-      </vxe-column>
-      <vxe-column field="orderId" title="本地订单" />
-      <vxe-column field="gatewayOrderNo" title="网关订单" />
-      <vxe-column field="amount" title="交易金额" sortable />
-      <vxe-column field="orderTime" title="订单时间" sortable />
-      <vxe-column fixed="right" width="80" :showOverflow="false" title="操作">
-        <template #default="{ row }">
-          <a-link @click="show(row)">查看</a-link>
-        </template>
-      </vxe-column>
-    </vxe-table>
-    <vxe-pager
-      size="medium"
-      :loading="loading"
-      :current-page="pagination.current"
-      :page-size="pagination.size"
-      :total="pagination.total"
-      @page-change="handleTableChange"
-    />
-    <reconcile-diff-info ref="reconcileDiffInfo" />
-  </basic-drawer>
-</template>
-
-<script setup lang="ts">
-  import { computed, nextTick, onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { page } from './ReconcileDiff.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import ReconcileDiffInfo from './ReconcileDiffInfo.vue'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
-  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
-  import { LabeledValue } from 'ant-design-vue/lib/select'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  import { ReconcileDetail } from '/@/views/payment/order/reconcile/detail/ReconcileDetail.api'
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, pagination, pages, sortParam, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage } = useMessage()
-  const { dictDropDown, dictConvert } = useDict()
-
-  let orderTypeList = $ref<LabeledValue[]>([])
-  let diffTypeList = $ref<LabeledValue[]>([])
-
-  // 查询条件
-  const fields = computed(() => {
-    return [
-      { field: 'title', type: STRING, name: '订单名称', placeholder: '请输入订单名称' },
-      { field: 'orderType', type: LIST, name: '订单类型', placeholder: '请选择订单类型', selectList: orderTypeList },
-      { field: 'diffType', type: LIST, name: '差异类型', placeholder: '请选择差异类型', selectList: diffTypeList },
-      { field: 'orderId', type: STRING, name: '本地定单', placeholder: '请输入本地定单ID' },
-      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入网关订单号' },
-    ] as QueryField[]
-  })
-  let visible = $ref(false)
-  let reconcileDetail = $ref<ReconcileDetail>()
-
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-  const reconcileDiffInfo = $ref<any>()
-
-  nextTick(() => {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  })
-
-  onMounted(() => {
-    initData()
-  })
-
-  /**
-   * 初始化基础数据
-   */
-  async function initData() {
-    orderTypeList = await dictDropDown('ReconcileTrade')
-    diffTypeList = await dictDropDown('ReconcileDiffType')
-  }
-  /**
-   * 入口
-   */
-  function init(record: ReconcileDetail) {
-    visible = true
-    reconcileDetail = record
-    model.queryParam = {}
-    xTable?.clearSort()
-    queryPage()
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-      ...sortParam,
-      recordId: reconcileDetail?.id,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-  }
-  /**
-   * 查看
-   */
-  function show(record) {
-    reconcileDiffInfo.init(record)
-  }
-  defineExpose({
-    init,
-  })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/order/refund/RefundChannelOrderInfo.vue b/src/views/payment/order/refund/RefundChannelOrderInfo.vue
deleted file mode 100644
index a0ca62fa3e79eaac663e72a915a3995ae6276628..0000000000000000000000000000000000000000
--- a/src/views/payment/order/refund/RefundChannelOrderInfo.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-  <basic-modal
-    title="通道退款订单详情"
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="750"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-      <a-descriptions-item label="通道订单ID">
-        {{ form.id }}
-      </a-descriptions-item>
-      <a-descriptions-item label="订单金额">
-        {{ form.orderAmount }}
-      </a-descriptions-item>
-      <a-descriptions-item label="退款金额">
-        {{ form.amount }}
-      </a-descriptions-item>
-      <a-descriptions-item label="通道支付单ID">
-        {{ form.payChannelId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="剩余可退余额">
-        {{ form.refundableAmount }}
-      </a-descriptions-item>
-      <a-descriptions-item label="退款通道">
-        {{ dictConvert('PayChannel', form.channel) }}
-      </a-descriptions-item>
-      <a-descriptions-item label="状态">
-        <span :style="dynamicStyle(form.status)">{{ dictConvert('RefundStatus', form.status) }}</span>
-      </a-descriptions-item>
-    </a-descriptions>
-
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-    </template>
-  </basic-modal>
-</template>
-<script setup lang="ts">
-  import { $ref } from 'vue/macros'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { getDetail, RefundChannelOrder } from './RefundOrder.api'
-  import { FormInstance } from 'ant-design-vue/lib/form'
-  import { BasicModal } from '/@/components/Modal'
-  import { useDict } from '/@/hooks/bootx/useDict'
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  const { dictConvert } = useDict()
-  // 表单
-  const formRef = $ref<FormInstance>()
-  let form = $ref<RefundChannelOrder>({})
-
-  // 事件
-  const emits = defineEmits(['ok'])
-  // 入口
-  function init(record) {
-    visible.value = true
-    confirmLoading.value = true
-    getDetail(record.id).then(({ data }) => {
-      form = data
-      confirmLoading.value = false
-    })
-  }
-  function dynamicStyle(item: string){
-    if (item == 'success') {
-      return { color: 'green' }
-    }
-    if (item == 'fail') {
-      return { color: 'red' }
-    }
-    if (item == 'progress') {
-      return { color: 'orange' }
-    }
-    if (item == 'close') {
-      return { color: 'gray' }
-    }
-    return { color: 'red' }
-  }
-  defineExpose({
-    init,
-  })
-</script>
-<style scoped lang="less"></style>
diff --git a/src/views/payment/order/refund/RefundChannelOrderList.vue b/src/views/payment/order/refund/RefundChannelOrderList.vue
deleted file mode 100644
index ea32e537597e4342791c604a2a0d121810dbe467..0000000000000000000000000000000000000000
--- a/src/views/payment/order/refund/RefundChannelOrderList.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <basic-drawer forceRender v-bind="$attrs" title="通道退款订单列表" width="60%" :visible="visible" @close="visible = false">
-    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table row-id="id" ref="xTable" :cell-style="cellStyle" :data="records" :loading="loading">
-      <vxe-column type="seq" width="60" />
-      <vxe-column field="channel" title="退款通道">
-        <template #default="{ row }">{{ dictConvert('PayChannel', row.channel) }}</template>
-      </vxe-column>
-      <vxe-column field="orderAmount" title="订单金额" />
-      <vxe-column field="amount" title="退款金额" />
-      <vxe-column field="refundableAmount" title="剩余可退余额" />
-      <vxe-column field="refundStatus" title="状态">
-        <template #default="{ row }">{{ dictConvert('RefundStatus', row.status) }}</template>
-      </vxe-column>
-      <vxe-column field="payChannelId" title="通道支付单ID" />
-      <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
-        <template #default="{ row }">
-          <span>
-            <a href="javascript:" @click="show(row)">查看</a>
-          </span>
-        </template>
-      </vxe-column>
-    </vxe-table>
-    <refund-channel-order-info ref="refundChannelOrderInfo" />
-  </basic-drawer>
-</template>
-
-<script setup lang="ts">
-import { nextTick } from 'vue'
-import { $ref } from 'vue/macros'
-import useTablePage from '/@/hooks/bootx/useTablePage'
-import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-import { useMessage } from '/@/hooks/web/useMessage'
-import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
-import { useDict } from '/@/hooks/bootx/useDict'
-import { listByChannel, RefundOrder } from './RefundOrder.api'
-import RefundChannelOrderInfo from './RefundChannelOrderInfo.vue'
-
-// 使用hooks
-const { resetQueryParams, model, loading } = useTablePage(queryPage)
-const { notification, createMessage } = useMessage()
-const { dictDropDown, dictConvert } = useDict()
-
-let visible = $ref(false)
-let refundOrder = $ref<RefundOrder>()
-let records = $ref<RefundOrder[]>([])
-const xTable = $ref<VxeTableInstance>()
-const xToolbar = $ref<VxeToolbarInstance>()
-const refundChannelOrderInfo = $ref<any>()
-
-nextTick(() => {
-  xTable?.connect(xToolbar as VxeToolbarInstance)
-})
-
-/**
- * 入口
- * @param record
- */
-function init(record) {
-  visible = true
-  refundOrder = record
-  queryPage()
-}
-
-/**
- * 分页查询
- */
-function queryPage() {
-  loading.value = true
-  listByChannel(refundOrder?.id).then(({ data }) => {
-    records = data
-    loading.value = false
-  })
-}
-/**
- * 查看
- */
-function show(record) {
-  refundChannelOrderInfo.init(record)
-}
-
-function cellStyle({ row, column }) {
-  if (column.field == 'refundStatus') {
-    if (row.status == 'success') {
-      return { color: 'green' }
-    }
-    if (row.status == 'fail') {
-      return { color: 'red' }
-    }
-    if (row.status == 'progress') {
-      return { color: 'orange' }
-    }
-    if (row.status == 'close') {
-      return { color: 'gray' }
-    }
-    return { color: 'red' }
-  }
-}
-defineExpose({
-  init,
-})
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/payment/order/refund/RefundOrder.api.ts b/src/views/payment/order/refund/RefundOrder.api.ts
index 2379536b580e0f13ec1959f56432a8aa46193be1..ea3eca029cd7de05de4728d2b4f06d06c6cb1e12 100644
--- a/src/views/payment/order/refund/RefundOrder.api.ts
+++ b/src/views/payment/order/refund/RefundOrder.api.ts
@@ -23,21 +23,21 @@ export function get(id) {
 }
 
 /**
- * 通道退款订单列表查询
+ * 获取单条
  */
-export function listByChannel(refundId) {
-  return defHttp.get<Result<RefundChannelOrder[]>>({
-    url: '/order/refund/listByChannel',
-    params: { refundId },
+export function getByRefundNo(refundNo) {
+  return defHttp.get<Result<any>>({
+    url: '/order/refund/findByOrderNo',
+    params: { refundNo },
   })
 }
 
 /**
- * 通道对款订单详情查询
+ * 获取订单扩展信息
  */
-export function getDetail(id) {
-  return defHttp.get<Result<RefundChannelOrder>>({
-    url: '/order/refund/findChannelById',
+export function getOrderExtra(id) {
+  return defHttp.get<Result<RefundOrderExtra>>({
+    url: '/order/refund/findExtraById',
     params: { id },
   })
 }
@@ -55,53 +55,63 @@ export function refund(params) {
 /**
  * 退款信息同步
  */
-export function syncById(id) {
+export function syncByRefundNo(refundNo) {
   return defHttp.post<Result<void>>({
-    url: '/order/refund/syncById',
-    params: { id },
+    url: '/order/refund/syncByRefundNo',
+    params: { refundNo },
   })
 }
 
 /**
  * 退款重试
  */
-export function resetRefund(id){
+export function resetRefund(id) {
   return defHttp.post<Result<void>>({
     url: '/order/refund/resetRefund',
     params: { id },
   })
 }
 
+/**
+ * 获取汇总金额
+ */
+export function getTotalAmount(param) {
+  return defHttp.get<Result<number>>({
+    url: '/order/refund/getTotalAmount',
+    params: param,
+  })
+}
+
 /**
  * 退款记录
  */
 export interface RefundOrder extends BaseEntity {
-  // 原支付记录id
-  paymentId?: string
-  // 原业务号
-  businessNo?: string
-  // 异步方式关联退款请求号
-  refundNo?: string
-  // 网关订单号
-  gatewayOrderNo?: string
-  // 是否是异步支付
-  asyncPay?: boolean
-  // 异步支付通道
-  asyncChannel?: boolean
-  // 标题
+  // 支付订单ID
+  orderId?: string
+  // 支付订单号
+  orderNo?: string
+  // 商户支付订单号
+  bizOrderNo?: string
+  // 支付标题
   title?: string
-  // 金额
+  // 退款号
+  refundNo?: string
+  // 商户退款号
+  bizRefundNo?: string
+  // 通道退款号
+  outRefundNo?: string
+  // 订单金额
+  orderAmount?: number
+  // 退款金额
   amount?: number
-  // 剩余可退款金额
-  refundableBalance?: number
+  // 退款通道
+  channel?: string
   // 退款状态
-  status?: number
-  // 退款时间
-  refundTime?: string
+  status?: string
+  // 退款结束时间
+  finishTime?: string
   // 退款原因
   reason?: string
-  // 客户ip
-  clientIp?: string
   // 错误码
   errorCode?: string
   // 错误信息
@@ -109,33 +119,19 @@ export interface RefundOrder extends BaseEntity {
 }
 
 /**
- * 通道退款订单
+ * 退款钉钉扩展信息
  */
-export interface RefundChannelOrder extends BaseEntity {
-  // 退款订单
-  refundId?: string
-  // 通道支付单id
-  payChannelId?: string
-  // 是否为异步支付
-  async?: boolean
-  // 通道
-  channel?: string
-  // 订单金额
-  orderAmount?: number
-  // 退款金额
-  amount?: number
-  // 剩余可退余额
-  refundableAmount?: number
-  // 状态
-  status?: string
-}
-
-/**
- * 可退款信息
- */
-export interface RefundableInfo {
-  // 支付通道
-  channel?: number
-  // 金额
-  amount?: number
+export interface RefundOrderExtra {
+  // 是否不需要异步通知
+  notNotify?: string
+  // 异步通知地址
+  notifyUrl?: string
+  // 商户扩展参数
+  attach?: string
+  // 附加参数
+  extraParam?: string
+  // 请求时间
+  reqTime?: string
+  // 支付终端ip
+  clientIp?: string
 }
diff --git a/src/views/payment/order/refund/RefundOrderInfo.vue b/src/views/payment/order/refund/RefundOrderInfo.vue
index 00dbe12bafff77c7cf55a009074cafb090cf8ff7..c767398e6102934ac795eb2348a4f9233f7dfc5e 100644
--- a/src/views/payment/order/refund/RefundOrderInfo.vue
+++ b/src/views/payment/order/refund/RefundOrderInfo.vue
@@ -3,59 +3,48 @@
     title="退款订单"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="750"
+    :width="1200"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
-    <a-descriptions title="" :column="{ md: 2, sm: 1, xs: 1 }">
-      <a-descriptions-item label="退款ID">
-        {{ form.id }}
+    <a-descriptions bordered>
+      <a-descriptions-item label="退款号" :span="2">
+        {{ order.refundNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="退款号">
-        {{ form.refundNo }}
+      <a-descriptions-item label="商户退款号" :span="2">
+        {{ order.bizRefundNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="原支付ID">
-        {{ form.paymentId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="原业务号">
-        {{ form.businessNo }}
-      </a-descriptions-item>
-      <a-descriptions-item label="网关订单号">
-        {{ form.gatewayOrderNo }}
+
+      <a-descriptions-item label="原支付标题" :span="2">
+        {{ order.title }}
       </a-descriptions-item>
-      <a-descriptions-item label="原支付标题">
-        {{ form.title }}
+      <a-descriptions-item label="支付订单号" :span="2">
+        {{ order.orderNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="退款原因">
-        {{ form.reason }}
+      <a-descriptions-item label="商户支付订单号" :span="2">
+        {{ order.bizOrderNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="退款金额">
-        {{ form.amount }}
+      <a-descriptions-item label="退款金额(元)" :span="2">
+        {{ order.amount ? (order.amount / 100).toFixed(2) : 0 }}
       </a-descriptions-item>
-      <a-descriptions-item label="剩余可退款金额">
-        {{ form.refundableBalance }}
+      <a-descriptions-item label="退款发起时间" :span="2">
+        {{ order.createTime }}
       </a-descriptions-item>
-      <a-descriptions-item label="订单金额信息">
-        <a-tag v-for="o in refundChannelOrders" :key="o.channel">{{ dictConvert('PayChannel', o.channel) }}: {{ o.orderAmount }}</a-tag>
+      <a-descriptions-item label="退款完成时间" :span="2">
+        {{ order.finishTime }}
       </a-descriptions-item>
-      <a-descriptions-item label="退款信息">
-        <a-tag v-for="o in refundChannelOrders" :key="o.channel">{{ dictConvert('PayChannel', o.channel) }}: {{ o.amount }}</a-tag>
+      <a-descriptions-item v-if="order.errorCode" label="错误码" :span="2">
+        {{ order.errorCode }}
       </a-descriptions-item>
-      <a-descriptions-item label="退款完成时间">
-        {{ form.refundTime }}
+      <a-descriptions-item v-if="order.errorMsg" label="错误信息" :span="2">
+        {{ order.errorMsg }}
       </a-descriptions-item>
-      <a-descriptions-item label="退款状态">
-        <a-tag>{{ dictConvert('RefundStatus', form.status) }}</a-tag>
+      <a-descriptions-item label="退款状态" :span="2">
+        <a-tag>{{ dictConvert('RefundStatus', order.status) }}</a-tag>
       </a-descriptions-item>
       <a-descriptions-item label="退款终端ip">
-        {{ form.clientIp }}
-      </a-descriptions-item>
-      <a-descriptions-item v-if="form.errorCode" label="错误码">
-        {{ form.errorCode }}
-      </a-descriptions-item>
-      <a-descriptions-item v-if="form.errorMsg" label="错误信息">
-        {{ form.errorMsg }}
+        {{ orderExtra.clientIp }}
       </a-descriptions-item>
     </a-descriptions>
     <template #footer>
@@ -67,43 +56,26 @@
 <script lang="ts" setup>
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { get, listByChannel, RefundChannelOrder, RefundOrder } from './RefundOrder.api'
-  import { FormInstance } from 'ant-design-vue/lib/form'
+  import {get, getByRefundNo, getOrderExtra, RefundOrder, RefundOrderExtra} from './RefundOrder.api'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
   const { dictConvert } = useDict()
   // 表单
-  const formRef = $ref<FormInstance>()
-  let form = $ref<RefundOrder>({})
-  let refundChannelOrders = $ref<RefundChannelOrder[]>([])
+  let order = $ref<RefundOrder>({})
+  let orderExtra = $ref<RefundOrderExtra>({})
 
   // 事件
   const emits = defineEmits(['ok'])
   // 入口
-  async function init(id) {
+  async function init(refundNo) {
     visible.value = true
     confirmLoading.value = true
-    await get(id).then(({ data }) => {
-      form = data
-    })
-    await listByChannel(id).then(({ data }) => {
-      refundChannelOrders = data
+    getByRefundNo(refundNo).then(({ data }) => {
+      order = data.refundOrder
+      orderExtra = data.refundOrderExtra
+      confirmLoading.value = false
     })
-    confirmLoading.value = false
   }
   defineExpose({
     init,
diff --git a/src/views/payment/order/refund/RefundOrderList.vue b/src/views/payment/order/refund/RefundOrderList.vue
index c4fa4576a2af209280924276e9761792dad2a26a..a2eabb9cd82fc69906f92258075628765c1436b2 100644
--- a/src/views/payment/order/refund/RefundOrderList.vue
+++ b/src/views/payment/order/refund/RefundOrderList.vue
@@ -4,14 +4,19 @@
       <b-query
         :query-params="model.queryParam"
         :fields="fields"
+        :default-item-count="3"
+        :sort-config="{ remote: true, trigger: 'cell' }"
         @query="queryPage"
         @reset="resetQueryParams"
-        :sort-config="{ remote: true, trigger: 'cell' }"
         @sort-change="sortChange"
       />
     </div>
     <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+        <template #buttons>
+          <span style="font-size: 18px">退款金额: {{ totalAmount ? (totalAmount / 100).toFixed(2) : 0 }}元</span>
+        </template>
+      </vxe-toolbar>
       <vxe-table
         row-id="id"
         :cell-style="cellStyle"
@@ -22,42 +27,43 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="id" title="退款ID" width="220" />
-        <vxe-column field="refundTime" title="退款时间" sortable width="180" />
-        <vxe-column field="title" title="原支付标题" width="160" />
-        <vxe-column field="paymentId" title="原支付ID" width="220">
+        <vxe-column field="refundNo" title="退款号" :min-width="220">
+          <template #default="{ row }">
+            <a @click="show(row)">
+              {{ row.refundNo }}
+            </a>
+          </template>
+        </vxe-column>
+        <vxe-column field="title" title="原支付标题" :min-width="160" />
+        <vxe-column field="orderNo" title="支付订单号" :min-width="220">
           <template #default="{ row }">
-            <a @click="showPayment(row.paymentId)">
-              {{ row.paymentId }}
+            <a @click="showPayOrder(row)">
+              {{ row.orderNo }}
             </a>
           </template>
         </vxe-column>
-        <vxe-column field="businessNo" title="原业务号" :visible="false" />
-        <vxe-column field="amount" title="退款金额(分)" sortable width="140" />
-        <vxe-column field="refundableBalance" title="剩余可退金额(分)" sortable width="160" />
-        <vxe-column field="async" title="包含异步通道" width="120">
+        <vxe-column field="channel" title="支付通道" :min-width="120">
           <template #default="{ row }">
-            {{ row.asyncPay ? '是' : '否' }}
+            {{ dictConvert('PayChannel', row.channel) }}
           </template>
         </vxe-column>
-        <vxe-column field="gatewayOrderNo" title="支付网关订单号" :visible="false" width="220" />
-        <vxe-column field="refundStatus" title="状态" width="80">
+        <vxe-column field="amount" title="退款金额(元)" :min-width="140">
+          <template #default="{ row }"> {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }} </template>
+        </vxe-column>
+        <vxe-column field="refundStatus" title="状态" :min-width="80">
           <template #default="{ row }">
             {{ dictConvert('RefundStatus', row.status) }}
           </template>
         </vxe-column>
-        <vxe-column field="reason" title="原因" width="160" />
-        <vxe-column fixed="right" width="220" :showOverflow="false" title="操作">
+        <vxe-column field="createTime" title="创建时间" sortable :min-width="220" />
+        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
             <a-divider type="vertical" />
-            <a-link @click="showChannel(row)">通道订单</a-link>
-            <a-divider type="vertical" />
-            <!--      只有异步订单才可以同步      -->
-            <a-link :disabled="!row.asyncPay" @click="sync(row)">同步</a-link>
+            <!--      钱包不可以同步      -->
+            <a-link @click="sync(row)">同步</a-link>
             <a-divider type="vertical" />
-            <!--      只有退款失败的异步订单才可以重新退款      -->
-            <a-link :disabled="!(row.asyncPay && row.status === 'fail')" @click="reset(row)">重试</a-link>
+            <a-link :disabled="!(row.status === 'fail')" @click="reset(row)">重试</a-link>
           </template>
         </vxe-column>
       </vxe-table>
@@ -70,7 +76,6 @@
         @page-change="handleTableChange"
       />
       <refund-order-info ref="refundOrderInfo" @ok="queryPage" />
-      <refund-channel-order-list ref="refundChannelOrderList" />
       <pay-order-info ref="payOrderInfo" />
     </div>
   </div>
@@ -79,43 +84,47 @@
 <script lang="ts" setup>
   import { computed, onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { page, resetRefund, syncById } from './RefundOrder.api'
+  import { getTotalAmount, page, resetRefund, syncByRefundNo } from './RefundOrder.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import RefundOrderInfo from './RefundOrderInfo.vue'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import { VxeTable, VxeTableInstance, VxeToolbar, VxeToolbarInstance } from 'vxe-table'
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
   import { useDict } from '/@/hooks/bootx/useDict'
   import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
   import { LabeledValue } from 'ant-design-vue/lib/select'
-  import RefundChannelOrderList from '/@/views/payment/order/refund/RefundChannelOrderList.vue'
   import ALink from '/@/components/Link/Link.vue'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, sortParam, pagination, pages, model, loading } =
     useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
+  const { createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
-  let payRefundStatusList = $ref<LabeledValue[]>([])
+  let channelList = $ref<LabeledValue[]>([])
+  let refundStatusList = $ref<LabeledValue[]>([])
+  let totalAmount = $ref<number>(0.0)
 
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'id', type: STRING, name: '退款ID', placeholder: '请输入完整退款ID' },
-      { field: 'refundNo', type: STRING, name: '退款号', placeholder: '请输入完整退款号' },
-      { field: 'paymentId', type: STRING, name: '原支付ID', placeholder: '请输入完整支付ID' },
-      { field: 'businessNo', type: STRING, name: '原业务号', placeholder: '请输入业务号' },
-      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
+      { field: 'bizRefundNo', type: STRING, name: '商户退款号', placeholder: '请输入商户退款号' },
+      { field: 'refundNo', type: STRING, name: '退款号', placeholder: '请输入退款号' },
+      { field: 'outRefundNo', type: STRING, name: '通道退款号', placeholder: '请输入通道退款号' },
+      { field: 'bizOrderNo', type: STRING, name: '商户订单号', placeholder: '请输入商户支付订单号' },
+      { field: 'orderNo', type: STRING, name: '订单号', placeholder: '请输入支付订单号' },
+      { field: 'outOrderNo', type: STRING, name: '通道订单号', placeholder: '请输入三方支付的通道订单号' },
       { field: 'title', type: STRING, name: '原支付标题', placeholder: '请输入原支付标题' },
+      { field: 'errorCode', name: '错误码', type: STRING },
       {
         field: 'status',
         type: LIST,
         name: '处理状态',
         placeholder: '请选择处理状态',
-        selectList: payRefundStatusList,
+        selectList: refundStatusList,
       },
+      { field: 'channel', name: '支付通道', type: LIST, selectList: channelList },
     ] as QueryField[]
   })
 
@@ -123,7 +132,6 @@
   const xToolbar = $ref<VxeToolbarInstance>()
   const refundOrderInfo = $ref<any>()
   const payOrderInfo = $ref<any>()
-  const refundChannelOrderList = $ref<any>()
 
   onMounted(() => {
     initData()
@@ -138,7 +146,8 @@
    * 初始化数据
    */
   async function initData() {
-    payRefundStatusList = await dictDropDown('RefundStatus')
+    refundStatusList = await dictDropDown('RefundStatus')
+    channelList = await dictDropDown('PayChannel')
   }
 
   /**
@@ -153,6 +162,12 @@
     }).then(({ data }) => {
       pageQueryResHandel(data)
     })
+    // 汇总数据
+    getTotalAmount({
+      ...model.queryParam,
+    }).then(({ data }) => {
+      totalAmount = data
+    })
     return Promise.resolve()
   }
 
@@ -166,7 +181,7 @@
       content: '是否同步退款信息',
       onOk: () => {
         loading.value = true
-        syncById(record.id).then(({ data }) => {
+        syncByRefundNo(record.refundNo).then(({ data }) => {
           // TODO 后期可以根据返回结果进行相应的处理
           createMessage.success('同步成功')
           console.log(data)
@@ -198,22 +213,14 @@
    * 查看
    */
   function show(record) {
-    refundOrderInfo.init(record.id)
+    refundOrderInfo.init(record.refundNo)
   }
 
   /**
    * 查看支付单信息
-   * @param paymentId
-   */
-  function showPayment(paymentId) {
-    payOrderInfo.init(paymentId)
-  }
-
-  /**
-   * 查看通道明细列表
    */
-  function showChannel(record) {
-    refundChannelOrderList.init(record)
+  function showPayOrder(record) {
+    payOrderInfo.init(record.orderNo)
   }
 
   function cellStyle({ row, column }) {
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts b/src/views/payment/reconcile/detail/ReconcileDetail.api.ts
similarity index 97%
rename from src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts
rename to src/views/payment/reconcile/detail/ReconcileDetail.api.ts
index 65b013c39b3fb1d2db6f0032b792eb10ecf2a6fb..fb82aa21af199b36a9c74f64102b8654cc6680ed 100644
--- a/src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts
+++ b/src/views/payment/reconcile/detail/ReconcileDetail.api.ts
@@ -34,7 +34,7 @@ export interface ReconcileDetail extends BaseEntity {
   paymentId?: string
   // 订单id
   refundId?: string
-  // 网关订单号
+  // 通道订单号
   gatewayOrderNo?: string
   // 交易金额
   amount?: string
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue b/src/views/payment/reconcile/detail/ReconcileDetailInfo.vue
similarity index 97%
rename from src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
rename to src/views/payment/reconcile/detail/ReconcileDetailInfo.vue
index 2ba47efb7fb2227f1e9a5499f7032b813ed5b8cf..a9b173ecf99924412a1fe6a6457dccd4d17ca704 100644
--- a/src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
+++ b/src/views/payment/reconcile/detail/ReconcileDetailInfo.vue
@@ -18,7 +18,7 @@
       <a-descriptions-item label="本地订单ID">
         {{ form.orderId }}
       </a-descriptions-item>
-      <a-descriptions-item label="网关订单号">
+      <a-descriptions-item label="通道订单号">
         {{ form.gatewayOrderNo }}
       </a-descriptions-item>
       <a-descriptions-item label="交易类型">
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue b/src/views/payment/reconcile/detail/ReconcileDetailList.vue
similarity index 92%
rename from src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
rename to src/views/payment/reconcile/detail/ReconcileDetailList.vue
index 4351a19f1ca530473ef76233dbaf225756e9b38d..2608b0ef709d07617ffef05093f6ac23864e8762 100644
--- a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
+++ b/src/views/payment/reconcile/detail/ReconcileDetailList.vue
@@ -12,9 +12,11 @@
     >
       <vxe-column type="seq" width="60" />
       <vxe-column field="title" title="订单名称" />
-      <vxe-column field="amount" title="交易金额" />
+      <vxe-column field="amount" title="交易金额">
+        <template #default="{ row }"> {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }} </template>
+      </vxe-column>
       <vxe-column field="orderId" title="本地订单ID" />
-      <vxe-column field="gatewayOrderNo" title="网关订单号" />
+      <vxe-column field="gatewayOrderNo" title="通道订单号" />
       <vxe-column field="repairType" title="交易类型">
         <template #default="{ row }">
           <a-tag>{{ dictConvert('ReconcileTrade', row.type) }}</a-tag>
@@ -70,7 +72,7 @@
       { field: 'title', type: STRING, name: '订单名称', placeholder: '请输入订单名称' },
       { field: 'type', type: LIST, name: '交易类型', placeholder: '请选择交易类型', selectList: reconcileTradeList },
       { field: 'orderId', type: STRING, name: '本地订单', placeholder: '请输入本地订单ID' },
-      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入网关订单号' },
+      { field: 'gatewayOrderNo', type: STRING, name: '通道订单号', placeholder: '请输入通道订单号' },
     ] as QueryField[]
   })
   let visible = $ref(false)
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts b/src/views/payment/reconcile/diff/ReconcileDiff.api.ts
similarity index 57%
rename from src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
rename to src/views/payment/reconcile/diff/ReconcileDiff.api.ts
index 8a01ebfdaa2f1c4555601d5378e7be49b4b2db50..966273dd15fe2c76ac8dee745f71440ca56312a8 100644
--- a/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
+++ b/src/views/payment/reconcile/diff/ReconcileDiff.api.ts
@@ -6,7 +6,7 @@ import { BaseEntity } from '/#/web'
  * 对账差异分页
  */
 export function page(params) {
-  return defHttp.get<Result<PageResult<ReconcileRecord>>>({
+  return defHttp.get<Result<PageResult<ReconcileDiff>>>({
     url: '/order/reconcile/diff/page',
     params,
   })
@@ -16,7 +16,7 @@ export function page(params) {
  * 对账差异详情
  */
 export function get(id: string) {
-  return defHttp.get<Result<ReconcileRecord>>({
+  return defHttp.get<Result<ReconcileDiff>>({
     url: '/order/reconcile/diff/findById',
     params: { id },
   })
@@ -25,29 +25,37 @@ export function get(id: string) {
 /**
  * 通用支付对账记录
  */
-export interface ReconcileRecord extends BaseEntity {
+export interface ReconcileDiff extends BaseEntity {
+  // 商品名称
+  title?: string
   // 关联对账订单ID
   recordOrderId?: string
+  // 对账号
+  reconcileNo?: string
+  // 对账日期
+  reconcileDate?: string
   // 交易类型
-  type?: string
-  // 订单id
-  paymentId?: string
-  // 订单id
-  refundId?: string
-  // 网关订单号
-  gatewayOrderNo?: string
+  tradeType?: string
+  // 本地交易号
+  tradeNo?: string
+  // 通道交易号
+  outTradeNo?: string
+  // 交易时间
+  tradeTime?: string
   // 交易金额
-  amount?: string
-  // 商品名称
-  title?: string
+  amount?: number
+  // 通道交易金额
+  outAmount?: number
+  // 差异类型
+  diffType?: string
   // 差异内容
-  diffs?: ReconcileDiff[]
+  diffs?: DiffInfo[]
 }
 
 /**
  * 差异内容
  */
-export interface ReconcileDiff {
+export interface DiffInfo {
   // 字段名
   fieldName?: string
   // 本地订单字段值
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue b/src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
similarity index 60%
rename from src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue
rename to src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
index 5380a024e18f350d79047f64687f7c0d256c2ddd..24fe8bb59cd023eb8d44b709d9a732886a7ae0ce 100644
--- a/src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue
+++ b/src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
@@ -3,39 +3,43 @@
     title="对账订单详情"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="750"
+    :width="1000"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
-    <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
+    <a-descriptions bordered title="" :column="{ md: 2, sm: 1, xs: 1 }">
       <a-descriptions-item label="订单标题">
         {{ form.title }}
       </a-descriptions-item>
-      <a-descriptions-item label="交易金额">
-        {{ form.amount }}
+      <a-descriptions-item label="对账号">
+        {{ form.reconcileNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="对账单ID">
-        {{ form.recordId }}
+      <a-descriptions-item label="对账日期">
+        {{ form.reconcileDate }}
       </a-descriptions-item>
-      <a-descriptions-item v-if="form.detailId" label="对账单明细ID">
-        {{ form.detailId }}
+      <a-descriptions-item label="本地交易号">
+        {{ form.tradeNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="本地订单ID">
-        {{ form.orderId }}
+
+      <a-descriptions-item label="交易时间">
+        {{ form.tradeTime }}
+      </a-descriptions-item>
+      <a-descriptions-item label="通道交易号">
+        {{ form.outTradeNo }}
       </a-descriptions-item>
-      <a-descriptions-item v-if="form.gatewayOrderNo" label="网关订单号">
-        {{ form.gatewayOrderNo }}
+      <a-descriptions-item label="交易金额(元)">
+        {{ form.amount ? (form.amount / 100).toFixed(2) : '无' }}
       </a-descriptions-item>
-      <a-descriptions-item label="订单类型">
-        <a-tag>{{ dictConvert('ReconcileTrade', form.orderType) }}</a-tag>
+      <a-descriptions-item label="通道交易金额(元)">
+        {{ form.outAmount ? (form.outAmount / 100).toFixed(2) : '无' }}
+      </a-descriptions-item>
+      <a-descriptions-item label="交易类型">
+        <a-tag>{{ dictConvert('ReconcileTrade', form.tradeType) }}</a-tag>
       </a-descriptions-item>
       <a-descriptions-item label="差异类型">
         <a-tag>{{ dictConvert('ReconcileDiffType', form.diffType) }}</a-tag>
       </a-descriptions-item>
-      <a-descriptions-item label="订单时间">
-        {{ form.orderTime }}
-      </a-descriptions-item>
       <template v-if="form.diffs">
         <a-descriptions-item :label="`${item.fieldName}[差异]`" :key="item" v-for="item in form.diffs">
           <a-tag>本地</a-tag> : {{ item.localValue }}<br /><a-tag>远程</a-tag> : {{ item.gatewayValue }}
@@ -53,28 +57,13 @@
 <script setup lang="ts">
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { FormInstance } from 'ant-design-vue/lib/form'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
-  import { get, ReconcileDiff, ReconcileRecord } from './ReconcileDiff.api'
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
+  import { get, ReconcileDiff } from './ReconcileDiff.api'
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
   const { dictConvert } = useDict()
   // 表单
-  const formRef = $ref<FormInstance>()
-  let form = $ref<ReconcileOrder>({})
+  let form = $ref<ReconcileDiff>({})
 
   // 事件
   const emits = defineEmits(['ok'])
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffList.vue b/src/views/payment/reconcile/diff/ReconcileDiffList.vue
similarity index 37%
rename from src/views/payment/order/reconcile/diff/ReconcileDiffList.vue
rename to src/views/payment/reconcile/diff/ReconcileDiffList.vue
index 697c8781a2749644670e25179575af24dabb3ac3..39989da9cd209e270cfc06e141eab966f9d4bba2 100644
--- a/src/views/payment/order/reconcile/diff/ReconcileDiffList.vue
+++ b/src/views/payment/reconcile/diff/ReconcileDiffList.vue
@@ -14,22 +14,42 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="title" title="订单标题" />
-        <vxe-column field="orderType" title="订单类型">
+        <vxe-column field="title" title="订单标题" :min-width="120" />
+        <vxe-column field="reconcileDate" title="对账日期" sortable :min-width="120" />
+        <vxe-column field="channel" title="通道" :min-width="120">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('ReconcileTrade', row.orderType) }}</a-tag>
+            <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="diffType" title="差异类型">
+        <vxe-column field="tradeType" title="交易类型" :min-width="120">
+          <template #default="{ row }">
+            <a-tag>{{ dictConvert('PaymentType', row.tradeType) }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="diffType" title="差异类型" :min-width="120">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('ReconcileDiffType', row.diffType) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="orderId" title="本地订单" />
-        <vxe-column field="gatewayOrderNo" title="网关订单" />
-        <vxe-column field="amount" title="交易金额" />
-        <vxe-column field="orderTime" title="订单时间" />
-        <vxe-column fixed="right" width="80" :showOverflow="false" title="操作">
+        <vxe-column field="tradeNo" title="本地交易号" :min-width="220">
+          <template #default="{ row }">
+            <a-link @click="showTrade(row)">{{ row.tradeNo }}</a-link>
+          </template>
+        </vxe-column>
+        <vxe-column field="outTradeNo" title="通道交易号" :min-width="220" />
+        <vxe-column field="amount" title="交易金额(元)" sortable :min-width="130">
+          <template #default="{ row }"> {{ row.amount ? (row.amount / 100).toFixed(2) : '无' }} </template>
+        </vxe-column>
+        <vxe-column field="outAmount" title="通道交易金额(元)" sortable :min-width="150">
+          <template #default="{ row }"> {{ row.outAmount ? (row.outAmount / 100).toFixed(2) : '无' }} </template>
+        </vxe-column>
+        <vxe-column field="tradeTime" title="交易时间" sortable :min-width="150" />
+        <vxe-column field="reconcileNo" title="对账单号" :min-width="220">
+          <template #default="{ row }">
+            <a-link @click="showReconcile(row)">{{ row.reconcileNo }}</a-link>
+          </template>
+        </vxe-column>
+        <vxe-column fixed="right" width="100" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
           </template>
@@ -43,55 +63,84 @@
         :total="pagination.total"
         @page-change="handleTableChange"
       />
-      <reconcile-diff-info ref="reconcileDiffInfo" />
     </div>
+    <reconcile-diff-info ref="reconcileDiffInfo" />
+    <pay-order-info ref="payOrderInfo" />
+    <refund-order-info ref="refundOrderInfo" />
+    <reconcile-detail-info ref="reconcileDetailInfo" />
   </div>
 </template>
+
 <script setup lang="ts">
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { computed, nextTick, onMounted } from 'vue'
+  import { $ref } from 'vue/macros'
+  import { page } from './ReconcileDiff.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
+  import ReconcileDiffInfo from './ReconcileDiffInfo.vue'
+  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import { useMessage } from '/@/hooks/web/useMessage'
-  import { useDict } from '/@/hooks/bootx/useDict'
+  import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { LabeledValue } from 'ant-design-vue/lib/select'
-  import { computed, onMounted } from 'vue'
-  import { DATE, LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
-  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { page } from './ReconcileDiff.api'
-  import ReconcileDiffInfo from './ReconcileDiffInfo.vue'
+  import { useDict } from '/@/hooks/bootx/useDict'
+  import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
+  import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.vue'
+  import ReconcileDetailInfo from '/@/views/payment/reconcile/detail/ReconcileDetailInfo.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, sortParam, pagination, pages, model, loading } =
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, pagination, pages, sortParam, model, loading } =
     useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
+  const { notification, createMessage } = useMessage()
+  const { dictDropDown, dictConvert } = useDict()
 
+  let tradeTypeList = $ref<LabeledValue[]>([])
+  let diffTypeList = $ref<LabeledValue[]>([])
   let payChannelList = $ref<LabeledValue[]>([])
 
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'title', type: DATE, name: '订单标题', placeholder: '请输入订单标题' },
+      { field: 'reconcileNo', type: STRING, name: '对账单号', placeholder: '请输入对账单号' },
+      { field: 'title', type: STRING, name: '订单名称', placeholder: '请输入订单名称' },
+      { field: 'tradeType', type: LIST, name: '交易类型', placeholder: '请选择交易类型', selectList: tradeTypeList },
+      { field: 'diffType', type: LIST, name: '差异类型', placeholder: '请选择差异类型', selectList: diffTypeList },
+      { field: 'channel', type: LIST, name: '对账通道', placeholder: '请选择对账', selectList: payChannelList },
+      { field: 'tradeNo', type: STRING, name: '本地交易号', placeholder: '请输入本地交易号' },
+      { field: 'outOrderNo', type: STRING, name: '通道交易号', placeholder: '请输入通道交易号' },
     ] as QueryField[]
   })
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
   const reconcileDiffInfo = $ref<any>()
+  const payOrderInfo = $ref<any>()
+  const refundOrderInfo = $ref<any>()
+  const reconcileDetailInfo = $ref<any>()
+
+  nextTick(() => {
+    xTable?.connect(xToolbar as VxeToolbarInstance)
+  })
 
   onMounted(() => {
     initData()
-    vxeBind()
-    queryPage()
+    init()
   })
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
 
   /**
-   * 初始化数据
+   * 初始化基础数据
    */
   async function initData() {
-    payChannelList = await dictDropDown('AsyncPayChannel')
+    tradeTypeList = await dictDropDown('PaymentType')
+    diffTypeList = await dictDropDown('ReconcileDiffType')
+    payChannelList = await dictDropDown('PayChannel')
+  }
+  /**
+   * 入口
+   */
+  function init() {
+    model.queryParam = {}
+    xTable?.clearSort()
+    queryPage()
   }
 
   /**
@@ -106,14 +155,40 @@
     }).then(({ data }) => {
       pageQueryResHandel(data)
     })
-    return Promise.resolve()
   }
   /**
-   * 查看详情
+   * 查看
    */
   function show(record) {
     reconcileDiffInfo.init(record)
   }
+
+  /**
+   * 查看对账单
+   */
+  function showReconcile(record) {
+    reconcileDiffInfo.init(record)
+  }
+
+  /**
+   * 查看交易单
+   */
+  function showTrade(record) {
+    if (record.callbackType === 'pay') {
+      payOrderInfo.init(record.tradeNo)
+    } else {
+      refundOrderInfo.init(record.tradeNo)
+    }
+  }
+  /**
+   * 查看通道交易信息
+   */
+  function showOutTrade(record) {
+    reconcileDetailInfo.init(record.outTradeNo)
+  }
+  defineExpose({
+    init,
+  })
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrder.api.ts b/src/views/payment/reconcile/order/ReconcileOrder.api.ts
similarity index 89%
rename from src/views/payment/order/reconcile/order/ReconcileOrder.api.ts
rename to src/views/payment/reconcile/order/ReconcileOrder.api.ts
index 436a8a092af26ef14eb6420d8f1a13f4e5ea5d26..f5994843a5c45f3c9a1dbd5d2b1313261c4c5de2 100644
--- a/src/views/payment/order/reconcile/order/ReconcileOrder.api.ts
+++ b/src/views/payment/reconcile/order/ReconcileOrder.api.ts
@@ -52,20 +52,25 @@ export function compare(id: any) {
   })
 }
 
+
 /**
  * 支付对账订单
  */
 export interface ReconcileOrder extends BaseEntity {
-  // 批次号
-  batchNo?: string
+  // 对账号
+  reconcileNo?: string
   // 日期
   date?: string
   // 通道
   channel?: string
   // 是否下载成功
-  down?: boolean
+  downOrUpload?: boolean
   // 是否比对完成
   compare?: boolean
+  // 比对结果
+  result?: string
+  // 错误码
+  errorCode?: string
   // 错误信息
   errorMsg?: string
 }
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrderCreate.vue b/src/views/payment/reconcile/order/ReconcileOrderCreate.vue
similarity index 100%
rename from src/views/payment/order/reconcile/order/ReconcileOrderCreate.vue
rename to src/views/payment/reconcile/order/ReconcileOrderCreate.vue
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue b/src/views/payment/reconcile/order/ReconcileOrderInfo.vue
similarity index 78%
rename from src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue
rename to src/views/payment/reconcile/order/ReconcileOrderInfo.vue
index f2ba307c12c7057c8c7c16725522cebfbe5a6c40..8658707abfb9cfb1d3ba089b0b56f1421aac8192 100644
--- a/src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue
+++ b/src/views/payment/reconcile/order/ReconcileOrderInfo.vue
@@ -3,35 +3,41 @@
     title="对账订单详情"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="750"
+    :width="1000"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
-    <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
+    <a-descriptions bordered title="" :column="{ md: 2, sm: 1, xs: 1 }">
+      <a-descriptions-item label="对账号" :span="2">
+        {{ form.reconcileNo }}
+      </a-descriptions-item>
       <a-descriptions-item label="日期">
         {{ form.date }}
       </a-descriptions-item>
-      <a-descriptions-item label="批次号">
-        {{ form.batchNo }}
-      </a-descriptions-item>
       <a-descriptions-item label="支付通道">
         <a-tag>{{ dictConvert('PayChannel', form.channel) }}</a-tag>
       </a-descriptions-item>
       <a-descriptions-item label="对账单下载/上传">
-        <a-tag v-if="form?.down" color="green">完成下载/上传</a-tag>
+        <a-tag v-if="form?.downOrUpload" color="green">完成下载/上传</a-tag>
         <a-tag v-else color="red">未下载/上传</a-tag>
       </a-descriptions-item>
       <a-descriptions-item label="对账单比对">
         <a-tag v-if="form?.compare" color="green">已比对</a-tag>
         <a-tag v-else color="red">未比对</a-tag>
       </a-descriptions-item>
-      <a-descriptions-item label="错误信息">
-        {{ form.errorMsg }}
+      <a-descriptions-item label="比对结果">
+        {{ dictConvert('ReconcileResult', form.result) || '无' }}
       </a-descriptions-item>
       <a-descriptions-item label="创建时间">
         {{ form.createTime }}
       </a-descriptions-item>
+      <a-descriptions-item v-if="form?.errorCode" label="错误码">
+        {{ form.errorCode }}
+      </a-descriptions-item>
+      <a-descriptions-item v-if="form?.errorMsg" label="错误信息">
+        {{ form.errorMsg }}
+      </a-descriptions-item>
     </a-descriptions>
     <template #footer>
       <a-space>
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrderList.vue b/src/views/payment/reconcile/order/ReconcileOrderList.vue
similarity index 59%
rename from src/views/payment/order/reconcile/order/ReconcileOrderList.vue
rename to src/views/payment/reconcile/order/ReconcileOrderList.vue
index 11cfdc4daa2faecf4c79c4e6a0583ed5ad9fc82f..93057240a2cfc24318f923ebc6aefe73fa155ca8 100644
--- a/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
+++ b/src/views/payment/reconcile/order/ReconcileOrderList.vue
@@ -20,17 +20,23 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="date" title="对账日期" />
-        <vxe-column field="batchNo" title="批次号" />
-        <vxe-column field="channel" title="支付通道">
+        <vxe-column field="date" title="对账日期" :min-width="100" />
+        <vxe-column field="reconcileNo" title="对账号" :min-width="220">
+          <template #default="{ row }">
+            <a @click="show(row)">
+              {{ row.reconcileNo }}
+            </a>
+          </template>
+        </vxe-column>
+        <vxe-column field="channel" title="对账通道" :min-width="100">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="down" title="下载或上传">
+        <vxe-column field="down" title="下载或上传" :min-width="100">
           <template #default="{ row }">
-            <template v-if="row.down">
-              <a-tag v-if="row.down" color="green">已完成</a-tag>
+            <template v-if="row.downOrUpload">
+              <a-tag v-if="row.downOrUpload" color="green">已完成</a-tag>
             </template>
             <template v-else>
               <a-link color="red" @click="down(row)">下载</a-link>
@@ -49,27 +55,38 @@
             </template>
           </template>
         </vxe-column>
-        <vxe-column field="compare" title="比对">
+        <vxe-column field="compare" title="比对" :min-width="100">
           <template #default="{ row }">
             <a-tag v-if="row.compare" color="green">已比对</a-tag>
-            <a-link v-else :disabled="!row.down" color="red" @click="compareOrder(row)">比对</a-link>
+            <a-link v-else :disabled="!row.downOrUpload" color="red" @click="compareOrder(row)">比对</a-link>
+          </template>
+        </vxe-column>
+        <vxe-column field="result" title="对账结果" :min-width="100">
+          <template #default="{ row }">
+            {{ dictConvert('ReconcileResult', row.result) }}
           </template>
         </vxe-column>
-        <vxe-column field="errorMsg" title="错误信息" />
-        <vxe-column field="createTime" title="创建时间" />
-        <vxe-column fixed="right" width="120" :showOverflow="false" title="操作">
+        <vxe-column field="errorMsg" title="错误信息" :min-width="160" />
+        <vxe-column field="createTime" title="创建时间" :min-width="160" />
+        <vxe-column fixed="right" :width="150" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
             <a-divider type="vertical" />
             <a-dropdown>
-              <a> 更多 <icon icon="ant-design:down-outlined" :size="12" /></a>
+              <a> 下载 <icon icon="ant-design:down-outlined" :size="12" /> </a>
               <template #overlay>
                 <a-menu>
                   <a-menu-item>
-                    <a-link @click="showDetailPage(row)">对账明细</a-link>
+                    <a-link @click="downOriginalFile(row)">原始对账单</a-link>
                   </a-menu-item>
                   <a-menu-item>
-                    <a-link @click="showDiffPage(row)">差异明细</a-link>
+                    <a-link @click="downOriginalTransferFile(row)">通道对账单</a-link>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a-link @click="downReconcileFile(row)">系统对账单</a-link>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a-link @click="downDiffFile(row)">差异明细</a-link>
                   </a-menu-item>
                 </a-menu>
               </template>
@@ -87,9 +104,7 @@
       />
     </div>
     <reconcile-order-create ref="reconcileOrderCreate" @ok="queryPage" />
-    <reconcile-detail-list ref="reconcileDetailList" />
     <reconcile-order-info ref="reconcileOrderInfo" />
-    <reconcile-diff-list-model ref="reconcileDiffListModel" />
   </div>
 </template>
 <script setup lang="ts">
@@ -103,11 +118,11 @@
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import { compare, downAndSave, page } from './ReconcileOrder.api'
   import ReconcileOrderInfo from './ReconcileOrderInfo.vue'
-  import ReconcileDetailList from '../detail/ReconcileDetailList.vue'
   import ReconcileOrderCreate from './ReconcileOrderCreate.vue'
   import ALink from '/@/components/Link/Link.vue'
-  import ReconcileDiffListModel from '/@/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue'
   import { useUpload } from '/@/hooks/bootx/useUpload'
+  import { useUserStoreWithOut } from '/@/store/modules/user'
+  import { getAppEnvConfig } from '/@/utils/env'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, sortParam, pagination, pages, model, loading } =
@@ -116,14 +131,18 @@
   const { dictConvert, dictDropDown } = useDict()
   // 手动上传对账单
   const { tokenHeader, uploadAction } = useUpload('/order/reconcile/upload')
+  const useUserStore = useUserStoreWithOut()
+  const { VITE_GLOB_API_URL, VITE_GLOB_API_URL_PREFIX } = getAppEnvConfig()
+  const downUrl = VITE_GLOB_API_URL + VITE_GLOB_API_URL_PREFIX
 
   let payChannelList = $ref<LabeledValue[]>([])
+  let reconcileResultList = $ref<LabeledValue[]>([])
 
   // 查询条件
   const fields = computed(() => {
     return [
       { field: 'date', type: DATE, name: '对账日期', placeholder: '请选择对账日期' },
-      { field: 'batchNo', type: STRING, name: '批次号', placeholder: '请输入对账批次号' },
+      { field: 'reconcileNo', type: STRING, name: '批次号', placeholder: '请输入对账批次号' },
       {
         field: 'channel',
         type: LIST,
@@ -131,6 +150,13 @@
         placeholder: '请选择对账通道',
         selectList: payChannelList,
       },
+      {
+        field: 'result',
+        type: LIST,
+        name: '对账结果',
+        placeholder: '请选择对账结果',
+        selectList: reconcileResultList,
+      },
     ] as QueryField[]
   })
 
@@ -138,8 +164,6 @@
   const xToolbar = $ref<VxeToolbarInstance>()
   const reconcileOrderCreate = $ref<any>()
   const reconcileOrderInfo = $ref<any>()
-  const reconcileDetailList = $ref<any>()
-  const reconcileDiffListModel = $ref<any>()
 
   onMounted(() => {
     initData()
@@ -155,6 +179,7 @@
    */
   async function initData() {
     payChannelList = await dictDropDown('AsyncPayChannel')
+    reconcileResultList = await dictDropDown('ReconcileResult')
   }
 
   /**
@@ -200,7 +225,7 @@
   }
 
   /**
-   * 对账明显比对
+   * 对账比对
    */
   function compareOrder(record) {
     createConfirm({
@@ -244,17 +269,68 @@
   }
 
   /**
-   * 查看明细列表
+   * 下载原始对账单
+   */
+  function downOriginalFile(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '提示',
+      content: '从三方支付系统中获取的交易对账单文件，未经过处理，确定要下载吗？',
+      onOk: () => {
+        const token = useUserStore.getToken
+        // 跳转到新页面进行下载
+        window.open(`${downUrl}/order/reconcile/downOriginal?id=${record.id}&Accesstoken=${token}`)
+      },
+    })
+  }
+
+  /**
+   * 下载原始对账单(转换)
    */
-  function showDetailPage(record) {
-    reconcileDetailList.init(record)
+  function downOriginalTransferFile(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '提示',
+      content: '将三方支付系统中的原始交易对账文件，转换为统一格式的CSV，确定要下载吗？',
+      onOk: () => {
+        const token = useUserStore.getToken
+        // 跳转到新页面进行下载
+        window.open(`${downUrl}/order/reconcile/downOriginal2Csv?id=${record.id}&Accesstoken=${token}`)
+      },
+    })
   }
 
   /**
-   * 查看差异单
+   * 下载对账单
    */
-  function showDiffPage(record) {
-    reconcileDiffListModel.init(record)
+  function downReconcileFile(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '提示',
+      content: '通过本系统中订单生成的对账单，确定要下载吗？',
+      onOk: () => {
+        const token = useUserStore.getToken
+        // 跳转到新页面进行下载
+        window.open(`${downUrl}/order/reconcile/downLocalCsv?id=${record.id}&Accesstoken=${token}`)
+      },
+    })
+  }
+
+  /**
+   * 下载对账差异明细
+   */
+  function downDiffFile(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '提示',
+      content: '确定要下载对账差异明细吗？',
+      onOk: () => {
+        const token = useUserStore.getToken
+        // 跳转到新页面进行下载
+        window.open(`${downUrl}/order/reconcile/downDiffCsv?id=${record.id}&Accesstoken=${token}`)
+        createMessage.info('对账差异明细单下载保存中.....')
+      },
+    })
   }
 </script>
 
diff --git a/src/views/payment/record/callback/PayCallbackRecord.api.ts b/src/views/payment/record/callback/PayCallbackRecord.api.ts
index 5571a0ce94393357b41b344e27adf39c27995628..d443beef741cc47b98000b7eeb53cdfdcb18568b 100644
--- a/src/views/payment/record/callback/PayCallbackRecord.api.ts
+++ b/src/views/payment/record/callback/PayCallbackRecord.api.ts
@@ -15,10 +15,10 @@ export function page(params) {
 /**
  * 获取单条
  */
-export function get(paymentId) {
+export function get(id) {
   return defHttp.get<Result<PayCallbackRecord>>({
     url: '/record/callback/findById',
-    params: { paymentId },
+    params: { id },
   })
 }
 
@@ -26,10 +26,10 @@ export function get(paymentId) {
  * 支付回调记录
  */
 export interface PayCallbackRecord extends BaseEntity {
-  // 本地订单id
-  orderId?: string
-  // 支付网关订单号
-  gatewayOrderNo?: string
+  // 交易号
+  tradeNo?: string
+  // 通道交易号
+  outTradeNo?: string
   // 支付通道
   channel?: string
   // 回调类型
@@ -38,8 +38,8 @@ export interface PayCallbackRecord extends BaseEntity {
   notifyInfo?: string
   // 回调处理状态
   status?: string
+  // 修复号
+  repairNo?: string
   // 提示信息
-  msg?: string
-  // 回调时间
-  notifyTime?: string
+  errorMsg?: string
 }
diff --git a/src/views/payment/record/callback/PayCallbackRecordInfo.vue b/src/views/payment/record/callback/PayCallbackRecordInfo.vue
index 9605a7ca442df9eb11a314f4b4282ff437c8d3f7..afdbbe759dbc87c2a4d724b0cc5929770cea8abd 100644
--- a/src/views/payment/record/callback/PayCallbackRecordInfo.vue
+++ b/src/views/payment/record/callback/PayCallbackRecordInfo.vue
@@ -3,37 +3,37 @@
     title="查看"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="modalWidth"
+    :width="1200"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="本地订单ID">
-          {{ form.orderId }}
+      <a-descriptions bordered title="">
+        <a-descriptions-item label="本地交易号" :span="2">
+          {{ form.tradeNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="网关订单号">
-          {{ form.gatewayOrderNo }}
+        <a-descriptions-item label="通道交易号" :span="2">
+          {{ form.outTradeNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="支付通道">
+        <a-descriptions-item label="支付通道" :span="2">
           <a-tag>{{ dictConvert('PayChannel', form.channel) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="回调类型">
+        <a-descriptions-item label="回调类型" :span="2">
           <a-tag>{{ dictConvert('PaymentType', form.callbackType) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="通知消息">
-          <json-preview :data="JSON.parse(form.notifyInfo || '{}')" />
-        </a-descriptions-item>
-        <a-descriptions-item label="状态">
+        <a-descriptions-item label="状态" :span="2">
           {{ dictConvert('PayCallbackStatus', form.status) }}
         </a-descriptions-item>
-        <a-descriptions-item label="提示消息" v-if="form.msg">
-          {{ form.msg }}
-        </a-descriptions-item>
         <a-descriptions-item label="通知时间">
           {{ form.createTime }}
         </a-descriptions-item>
+        <a-descriptions-item label="提示消息" v-if="form.errorMsg" :span="4">
+          {{ form.errorMsg }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通知消息" :span="4">
+          <json-preview :data="JSON.parse(form.notifyInfo || '{}')" />
+        </a-descriptions-item>
       </a-descriptions>
     </a-spin>
     <template #footer>
@@ -50,24 +50,10 @@
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
   import JsonPreview from '/@/components/CodeEditor/src/json-preview/JsonPreview.vue'
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
+  const { handleCancel, modalWidth, confirmLoading, visible, showable } = useFormEdit()
   const { dictConvert } = useDict()
 
   // 表单
-  const formRef = $ref<FormInstance>()
   let form = $ref<PayCallbackRecord>({})
   // 入口
   function init(id) {
@@ -84,4 +70,8 @@
   })
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  /deep/ .ant-descriptions-item-label {
+    width: 170px;
+  }
+</style>
diff --git a/src/views/payment/record/callback/PayCallbackRecordList.vue b/src/views/payment/record/callback/PayCallbackRecordList.vue
index 9af0e0ac1ce6e187c4188855238125f256842c0c..313246de22b63db78b4ed5b5587f4f2a85bd66fa 100644
--- a/src/views/payment/record/callback/PayCallbackRecordList.vue
+++ b/src/views/payment/record/callback/PayCallbackRecordList.vue
@@ -14,10 +14,10 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="orderId" title="本地订单ID" width="170">
+        <vxe-column field="orderId" title="订单号" :min-width="220">
           <template #default="{ row }">
             <a @click="showOrder(row)">
-              {{ row.orderId }}
+              {{ row.tradeNo }}
             </a>
           </template>
         </vxe-column>
@@ -36,7 +36,7 @@
             <a-tag>{{ dictConvert('PayCallbackStatus', row.status) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="msg" title="提示信息" />
+        <vxe-column field="msg" title="提示信息" :min-width="250" />
         <vxe-column field="createTime" title="通知时间" sortable />
         <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
           <template #default="{ row }">
@@ -88,10 +88,10 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入完整本地订单ID' },
-      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
+      { field: 'tradeNo', type: STRING, name: '本地交易号', placeholder: '请输入本地交易号' },
+      { field: 'outTradeNo', type: STRING, name: '通道交易号', placeholder: '请输入通道交易号' },
       {
-        field: 'payChannel',
+        field: 'channel',
         type: LIST,
         name: '支付通道',
         placeholder: '请选择支付通道',
@@ -156,9 +156,9 @@
    */
   function showOrder(record: PayCallbackRecord) {
     if (record.callbackType === 'pay') {
-      payOrderInfo.init(record.orderId)
+      payOrderInfo.init(record.tradeNo)
     } else {
-      refundOrderInfo.init(record.orderId)
+      refundOrderInfo.init(record.tradeNo)
     }
   }
 </script>
diff --git a/src/views/payment/record/close/PayCloseRecord.api.ts b/src/views/payment/record/close/PayCloseRecord.api.ts
index 1946be511c24a78ade779b40740a1f1935529f7f..370727eead9e1f9a0eb4fd4a7813c5662d24cb0a 100644
--- a/src/views/payment/record/close/PayCloseRecord.api.ts
+++ b/src/views/payment/record/close/PayCloseRecord.api.ts
@@ -15,10 +15,10 @@ export function page(params) {
 /**
  * 获取单条
  */
-export function get(paymentId) {
+export function get(id) {
   return defHttp.get<Result<PayCloseRecord>>({
     url: '/record/close/findById',
-    params: { paymentId },
+    params: { id },
   })
 }
 
@@ -26,18 +26,19 @@ export function get(paymentId) {
  * 支付回调记录
  */
 export interface PayCloseRecord extends BaseEntity {
-  // 支付ID
-  paymentId?: string
-  // 业务号
-  businessNo?: string
-  // 关闭的异步支付通道
-  asyncChannel?: string
+  // 订单号
+  orderNo?: string
+  // 商户订单号
+  bizOrderNo?: string
+  // 关闭的支付通道
+  channel?: string
   // 是否关闭成功
   closed?: boolean
+  // 错误编码
+  errorCode?: string
   // 错误消息
   errorMsg?: string
   // 客户端IP
   clientIp?: string
-  // 请求链路ID
-  reqId?: string
 }
+
diff --git a/src/views/payment/record/close/PayCloseRecordInfo.vue b/src/views/payment/record/close/PayCloseRecordInfo.vue
index 4900c6d48a7d553b9f600d87d1b1e99ad46d087a..72318b905e10a51cd914362bad6f884cdb8cf7b0 100644
--- a/src/views/payment/record/close/PayCloseRecordInfo.vue
+++ b/src/views/payment/record/close/PayCloseRecordInfo.vue
@@ -10,23 +10,26 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="支付记录id">
-          {{ form.paymentId }}
+        <a-descriptions-item label="订单号">
+          {{ form.orderNo }}
         </a-descriptions-item>
         <a-descriptions-item label="业务号">
-          {{ form.businessNo }}
+          {{ form.bizOrderNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="异步支付通道">
-          {{ dictConvert('PayChannel', form.asyncChannel) }}
+        <a-descriptions-item label="支付通道">
+          {{ dictConvert('PayChannel', form.channel) }}
         </a-descriptions-item>
         <a-descriptions-item label="是否关闭成功">
           {{ form.closed ? '是' : '否' }}
         </a-descriptions-item>
+        <a-descriptions-item label="错误编码" v-if="form.errorCode">
+          {{ form.errorMsg }}
+        </a-descriptions-item>
         <a-descriptions-item label="错误消息" v-if="form.errorMsg">
           {{ form.errorMsg }}
         </a-descriptions-item>
         <a-descriptions-item label="客户端IP">
-          {{ form.clientIp }}
+          {{ form.clientIp || '无' }}
         </a-descriptions-item>
         <a-descriptions-item label="关闭时间">
           {{ form.createTime }}
@@ -47,18 +50,11 @@
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
   const {
-    initFormEditType,
     handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
     modalWidth,
-    title,
     confirmLoading,
     visible,
-    editable,
     showable,
-    formEditType,
   } = useFormEdit()
   const { dictConvert } = useDict()
 
diff --git a/src/views/payment/record/close/PayCloseRecordList.vue b/src/views/payment/record/close/PayCloseRecordList.vue
index 7176846ee26fe2bf83f4dc26962ff0a2c2a1be0f..b9c8b4f25aaeaaeed67a5a88c64552b1cd2224e7 100644
--- a/src/views/payment/record/close/PayCloseRecordList.vue
+++ b/src/views/payment/record/close/PayCloseRecordList.vue
@@ -14,23 +14,23 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="paymentId" title="原支付ID" width="170" sortable>
+        <vxe-column field="orderNo" title="订单号" :min-width="180">
           <template #default="{ row }">
-            <a @click="showPayment(row.paymentId)">
-              {{ row.paymentId }}
+            <a @click="showPayOder(row.orderNo)">
+              {{ row.orderNo }}
             </a>
           </template>
         </vxe-column>
-        <vxe-column field="businessNo" title="业务号" />
+        <vxe-column field="bizOrderNo" title="商户订单号" :min-width="180" />
         <vxe-column field="closed" title="关闭状态">
           <template #default="{ row }">
             <a-tag v-if="row.closed" color="green">成功</a-tag>
             <a-tag v-else color="red">失败</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="asyncChannel" title="异步支付通道">
+        <vxe-column field="channel" title="支付通道">
           <template #default="{ row }">
-            {{ dictConvert('AsyncPayChannel', row.asyncChannel) }}
+            {{ dictConvert('PayChannel', row.channel) }}
           </template>
         </vxe-column>
         <vxe-column field="errorMsg" title="错误消息" />
@@ -73,7 +73,8 @@
   import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } = useTablePage(queryPage)
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
+    useTablePage(queryPage)
   const { notification, createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
@@ -82,8 +83,8 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'paymentId', type: STRING, name: '支付单号', placeholder: '请输入支付单号' },
-      { field: 'businessNo', type: STRING, name: '业务号', placeholder: '请输入业务号' },
+      { field: 'orderNo', type: STRING, name: '订单号', placeholder: '请输入订单号' },
+      { field: 'bizOrderNo', type: STRING, name: '商户订单号', placeholder: '请输入商户订单号' },
       {
         field: 'channel',
         type: LIST,
@@ -133,7 +134,7 @@
     page({
       ...model.queryParam,
       ...pages,
-      ...sortParam
+      ...sortParam,
     }).then(({ data }) => {
       pageQueryResHandel(data)
     })
@@ -148,10 +149,9 @@
 
   /**
    * 查看支付单信息
-   * @param paymentId
    */
-  function showPayment(paymentId) {
-    payOrderInfo.init(paymentId)
+  function showPayOder(orderNo) {
+    payOrderInfo.init(orderNo)
   }
 </script>
 
diff --git a/src/views/payment/record/repair/PayRepairRecord.api.ts b/src/views/payment/record/repair/PayRepairRecord.api.ts
index 54485b47e41521704b96a408a0e50f457e4be876..31f188923c5e554f8bd94d2edee15c48c6ae980d 100644
--- a/src/views/payment/record/repair/PayRepairRecord.api.ts
+++ b/src/views/payment/record/repair/PayRepairRecord.api.ts
@@ -29,9 +29,9 @@ export interface PayRepairRecord extends BaseEntity {
   // 修复号
   repairNo?: string
   // 本地订单ID
-  orderId?: string
-  // 本地业务号
-  orderNo?: string
+  tradeId?: string
+  // 本地交易号
+  tradeNo?: string
   // 类型  支付修复/退款修复
   repairType?: string
   // 修复来源
@@ -39,11 +39,9 @@ export interface PayRepairRecord extends BaseEntity {
   // 修复类型
   repairWay?: string
   // 修复的异步支付通道
-  asyncChannel?: string
+  channel?: string
   // 修复前状态
   beforeStatus?: string
   // 修复后状态
   afterStatus?: string
-  // 金额变动
-  amount?: string
 }
diff --git a/src/views/payment/record/repair/PayRepairRecordInfo.vue b/src/views/payment/record/repair/PayRepairRecordInfo.vue
index b2c20211a4ce6eeed45bb3266108a14b94ec9153..e9823ee90139d2803d4372388509076b419a729d 100644
--- a/src/views/payment/record/repair/PayRepairRecordInfo.vue
+++ b/src/views/payment/record/repair/PayRepairRecordInfo.vue
@@ -3,30 +3,27 @@
     title="查看"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="modalWidth"
+    :width="1200"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="主键ID">
-          {{ form.id }}
-        </a-descriptions-item>
+      <a-descriptions bordered title="" :column="{ md: 2, sm: 1, xs: 1 }">
         <a-descriptions-item label="修复单号">
           {{ form.repairNo }}
         </a-descriptions-item>
         <a-descriptions-item label="本地订单ID">
-          {{ form.orderId }}
+          {{ form.tradeId }}
         </a-descriptions-item>
-        <a-descriptions-item label="本地业务号">
-          {{ form.orderNo }}
+        <a-descriptions-item label="本地 号">
+          {{ form.tradeNo }}
         </a-descriptions-item>
         <a-descriptions-item label="修复类型">
           <a-tag>{{ dictConvert('PaymentType', form.repairType) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item v-if="form.repairType === 'pay'" label="修复通道">
-          <a-tag>{{ dictConvert('AsyncPayChannel', form.asyncChannel) }}</a-tag>
+        <a-descriptions-item label="修复通道">
+          <a-tag>{{ dictConvert('PayChannel', form.channel) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复来源">
           <a-tag>{{ dictConvert('PayRepairSource', form.repairSource) }}</a-tag>
@@ -62,18 +59,11 @@
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
   const {
-    initFormEditType,
     handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
     modalWidth,
-    title,
     confirmLoading,
     visible,
-    editable,
     showable,
-    formEditType,
   } = useFormEdit()
   const { dictConvert } = useDict()
 
diff --git a/src/views/payment/record/repair/PayRepairRecordList.vue b/src/views/payment/record/repair/PayRepairRecordList.vue
index 479ad68f6971e2fbefd9d598cdadc860724a433a..88ee4ab8692643e1f9122eb179aeb07a2609f369 100644
--- a/src/views/payment/record/repair/PayRepairRecordList.vue
+++ b/src/views/payment/record/repair/PayRepairRecordList.vue
@@ -14,16 +14,22 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="repairNo" title="修复单号" min-width="170" />
+        <vxe-column field="repairNo" title="修复单号" :min-width="170" >
+          <template #default="{ row }">
+            <a @click="show(row)">
+              {{ row.repairNo }}
+            </a>
+          </template>
+        </vxe-column>
         <vxe-column field="repairWay" title="修复方式">
           <template #default="{ row }">
             <a-tag color="green">{{ dictConvert('PayRepairWay', row.repairWay) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="orderId" title="本地订单ID" width="170">
+        <vxe-column field="tradeNo" title="本地交易号" :min-width="170">
           <template #default="{ row }">
             <a @click="showOrder(row)">
-              {{ row.orderId }}
+              {{ row.tradeNo }}
             </a>
           </template>
         </vxe-column>
@@ -92,8 +98,7 @@
   const fields = computed(() => {
     return [
       { field: 'repairNo', type: STRING, name: '修复单号', placeholder: '请输入修复号' },
-      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入本地订单ID' },
-      { field: 'orderNo', type: STRING, name: '本地订单号', placeholder: '请输入本地订单号' },
+      { field: 'tradeNo', type: STRING, name: '本地交易号', placeholder: '请输入本地交易号' },
       {
         field: 'repairSource',
         type: LIST,
@@ -116,7 +121,7 @@
         selectList: repairWayList,
       },
       {
-        field: 'asyncChannel',
+        field: 'channel',
         type: LIST,
         name: '修复通道',
         placeholder: '请选择修复通道',
@@ -177,9 +182,9 @@
   function showOrder(record: PayRepairRecord) {
     console.log(record)
     if (record.repairType === 'pay') {
-      payOrderInfo.init(record.orderId)
+      payOrderInfo.init(record.tradeNo)
     } else {
-      refundOrderInfo.init(record.orderId)
+      refundOrderInfo.init(record.tradeNo)
     }
   }
 </script>
diff --git a/src/views/payment/record/sync/PaySyncRecord.api.ts b/src/views/payment/record/sync/PaySyncRecord.api.ts
index eb53872754d2fe2c85d3aa9fc2929702db3bd22e..f441b5344a71ef76ea629504d450a1c5668c4088 100644
--- a/src/views/payment/record/sync/PaySyncRecord.api.ts
+++ b/src/views/payment/record/sync/PaySyncRecord.api.ts
@@ -15,10 +15,10 @@ export function page(params) {
 /**
  * 获取单条
  */
-export function get(paymentId) {
+export function get(id) {
   return defHttp.get<Result<SyncRecord>>({
     url: '/record/sync/findById',
-    params: { paymentId },
+    params: { id },
   })
 }
 
@@ -26,47 +26,30 @@ export function get(paymentId) {
  * 支付同步记录
  */
 export interface SyncRecord extends BaseEntity {
-  // 本地订单id
-  orderId?: string
-  // 本地业务号
-  orderNo?: string
-  // 网关订单号
-  gatewayOrderNo?: string
+  // 本地交易号
+  tradeNo?: string
+  // 商户交易号
+  bizTradeNo?: string
+  // 通道交易号
+  outTradeNo?: string
   // 同步类型
   syncType?: string
   // 同步通道
-  asyncChannel?: string
+  channel?: string
   // 通知消息
   syncInfo?: string
-  // 网关返回状态
-  gatewayStatus?: string
+  // 三方支付返回状态
+  outTradeStatus?: string
   // 是否进行修复
-  repairOrder?: boolean
+  repair?: boolean
   // 修复号
-  repairOrderNo?: boolean
+  repairNo?: string
+  // 错误消息
+  errorCode?: string
   // 错误消息
   errorMsg?: string
   // 同步时间
   createTime?: string
   // 终端ip
   clientIp?: string
-  // 请求链路ID
-  reqId?: string
-}
-/**
- * 支付同步结果
- */
-export interface PaySyncResult {
-  // 支付网关同步状态
-  gatewayStatus?: string
-  // 是否同步成功
-  success?: boolean
-  // 是否进行了修复
-  repair?: boolean
-  // 支付单同步前状态
-  beforeStatus?: string
-  // 支付单同步后状态
-  afterStatus?: string
-  // 支付单同步后状态
-  errorMsg?: string
 }
diff --git a/src/views/payment/record/sync/PaySyncRecordInfo.vue b/src/views/payment/record/sync/PaySyncRecordInfo.vue
index 06dc0b0ad998fe34123d138090008d2e4527bd08..84d96f3d9cb5029f18f17ae1eae30521d5e6a809 100644
--- a/src/views/payment/record/sync/PaySyncRecordInfo.vue
+++ b/src/views/payment/record/sync/PaySyncRecordInfo.vue
@@ -3,47 +3,50 @@
     title="查看同步信息"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="750"
+    :width="1200"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="本地订单号">
-          {{ form.orderId }}
+      <a-descriptions title="" bordered>
+        <a-descriptions-item label="本地交易号" :span="4">
+          {{ form.tradeNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="本地业务号">
-          {{ form.orderNo }}
+        <a-descriptions-item label="商户交易号" :span="2">
+          {{ form.bizTradeNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="网关订单号">
-          {{ form.gatewayOrderNo }}
+        <a-descriptions-item label="通道交易号" :span="2">
+          {{ form.outTradeNo || '无' }}
         </a-descriptions-item>
-        <a-descriptions-item label="同步类型">
+        <a-descriptions-item label="同步类型" :span="2">
           <a-tag>{{ dictConvert('PaymentType', form.syncType) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="同步通道">
-          <a-tag> {{ dictConvert('AsyncPayChannel', form.asyncChannel) }}</a-tag>
+        <a-descriptions-item label="同步通道" :span="2">
+          <a-tag> {{ dictConvert('AsyncPayChannel', form.channel) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="同步结果">
-          <a-tag v-if="form.syncType === 'pay'">{{ dictConvert('PaySyncStatus', form.gatewayStatus) }}</a-tag>
-          <a-tag v-else>{{ dictConvert('RefundSyncStatus', form.gatewayStatus) }}</a-tag>
+        <a-descriptions-item label="同步结果" :span="2">
+          <a-tag v-if="form.syncType === 'pay'">{{ dictConvert('PaySyncStatus', form.outTradeStatus) }}</a-tag>
+          <a-tag v-else>{{ dictConvert('RefundSyncStatus', form.outTradeStatus) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="修复单号">
-          <a-tag v-if="form.repairOrder" color="green"> {{ form.repairOrderNo }} </a-tag>
+        <a-descriptions-item label="修复单号" :span="2">
+          <a-tag v-if="form.repair" color="green"> {{ form.repairNo }} </a-tag>
           <a-tag v-else>无需修复</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="同步时间">
+        <a-descriptions-item label="客户端IP" :span="2">
+          {{ form.clientIp }}
+        </a-descriptions-item>
+        <a-descriptions-item label="同步时间" :span="2">
           {{ form.createTime }}
         </a-descriptions-item>
-        <a-descriptions-item label="同步消息">
-          <json-preview :data="XEUtils.toStringJSON(form.syncInfo || '{}')" />
+        <a-descriptions-item label="错误编码" v-if="form.errorCode" :span="2">
+          {{ form.errorMsg }}
         </a-descriptions-item>
-        <a-descriptions-item label="错误信息" v-if="form.errorMsg">
+        <a-descriptions-item label="错误信息" v-if="form.errorMsg" :span="2">
           {{ form.errorMsg }}
         </a-descriptions-item>
-        <a-descriptions-item label="客户端IP">
-          {{ form.clientIp }}
+        <a-descriptions-item label="同步消息" :span="4">
+          <json-preview :data="XEUtils.toStringJSON(form.syncInfo || '{}')" />
         </a-descriptions-item>
       </a-descriptions>
     </a-spin>
@@ -63,24 +66,10 @@
   import JsonPreview from '/@/components/CodeEditor/src/json-preview/JsonPreview.vue'
   import XEUtils from 'xe-utils'
 
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
   const { dictConvert } = useDict()
 
   // 表单
-  const formRef = $ref<FormInstance>()
   let form = $ref<SyncRecord>({})
   // 入口
   function init(id) {
@@ -97,4 +86,8 @@
   })
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  /deep/ .ant-descriptions-item-label {
+    width: 170px;
+  }
+</style>
diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue
index 69dbffd96a21260e339f839c1268a068aed62cc1..53cf66ca55c4402cd7643fa6db1ef93fe151cf87 100644
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -7,28 +7,28 @@
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
       <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="orderId" title="本地订单号" width="170" sortable>
+        <vxe-column field="tradeNo" title="本地交易号" :min-width="220">
           <template #default="{ row }">
             <a @click="showOrder(row)">
-              {{ row.orderId }}
+              {{ row.tradeNo }}
             </a>
           </template>
         </vxe-column>
-        <vxe-column field="orderNo" title="本地业务号" />
-        <vxe-column field="channel" title="同步类型">
+        <vxe-column field="bizTradeNo" title="商户交易号" :min-width="220" />
+        <vxe-column field="channel" title="同步类型" :min-width="60">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PaymentType', row.syncType) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="channel" title="同步通道">
+        <vxe-column field="channel" title="同步通道" :min-width="100">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('AsyncPayChannel', row.asyncChannel) }}</a-tag>
+            <a-tag>{{ dictConvert('AsyncPayChannel', row.channel) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="status" title="同步结果">
+        <vxe-column field="status" title="同步结果" :min-width="100">
           <template #default="{ row }">
-            <a-tag v-if="row.syncType === 'pay'">{{ dictConvert('PaySyncStatus', row.gatewayStatus) }}</a-tag>
-            <a-tag v-else>{{ dictConvert('RefundSyncStatus', row.gatewayStatus) }}</a-tag>
+            <a-tag v-if="row.syncType === 'pay'">{{ dictConvert('PaySyncStatus', row.outTradeStatus) }}</a-tag>
+            <a-tag v-else>{{ dictConvert('RefundSyncStatus', row.outTradeStatus) }}</a-tag>
           </template>
         </vxe-column>
         <vxe-column field="repairOrder" title="是否修复" width="170">
@@ -37,10 +37,9 @@
             <a-tag v-else>无需修复</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="gatewayOrderNo" title="网关订单号" width="170" />
-        <vxe-column field="errorMsg" title="错误消息" />
-        <vxe-column field="createTime" title="同步时间" />
-        <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
+        <vxe-column field="errorMsg" title="错误消息" :min-width="160"/>
+        <vxe-column field="createTime" title="同步时间" :min-width="160" />
+        <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <span>
               <a-link @click="show(row)">查看</a-link>
@@ -92,8 +91,9 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入本地订单ID' },
-      { field: 'orderNo', type: STRING, name: '本地订单号', placeholder: '请输入本地订单号' },
+      { field: 'tradeNo', type: STRING, name: '本地交易号', placeholder: '请输入本地交易号' },
+      { field: 'bizTradeNo', type: STRING, name: '商户交易号', placeholder: '请输入商户交易号' },
+      { field: 'bizTradeNo', type: STRING, name: '通道交易号', placeholder: '请输入通道交易号' },
       {
         field: 'syncType',
         type: LIST,
@@ -102,7 +102,7 @@
         selectList: syncTypeList,
       },
       {
-        field: 'gatewayStatus',
+        field: 'outTradeStatus',
         type: LIST,
         name: '同步结果',
         placeholder: '请选择同步结果',
@@ -167,18 +167,12 @@
    * 查看支付单信息
    */
   function showOrder(record) {
-    if (record.callbackType === 'pay') {
-      payOrderInfo.init(record.orderId)
+    if (record.syncType === 'pay') {
+      payOrderInfo.init(record.tradeNo)
     } else {
-      refundOrderInfo.init(record.orderId)
+      refundOrderInfo.init(record.tradeNo)
     }
   }
-  /**
-   * 查看修复信息
-   */
-  function showRepairInfo(repairId) {
-    payRepairRecordInfo.init(repairId)
-  }
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/payment/system/api/PayApiConfig.api.ts b/src/views/payment/system/api/PayApiConfig.api.ts
index 121aaa74a239be397a7475fcba73e0e708600c20..4115e4ec4f1cae0b06580752a36342f704378499 100644
--- a/src/views/payment/system/api/PayApiConfig.api.ts
+++ b/src/views/payment/system/api/PayApiConfig.api.ts
@@ -55,8 +55,6 @@ export interface PayApiConfig extends BaseEntity {
   reqSign?: boolean
   // 响应参数是否签名
   resSign?: boolean
-  // 回调信息是否签名
-  noticeSign?: boolean
   // 是否记录请求的信息
-  record?: boolean
+  remark?: string
 }
diff --git a/src/views/payment/system/api/PayApiConfigEdit.vue b/src/views/payment/system/api/PayApiConfigEdit.vue
index bfb057593eaf6603a5a06a74c4533c943eca0d99..cbb133f4a994065cb9d107893d4c03d400517a7d 100644
--- a/src/views/payment/system/api/PayApiConfigEdit.vue
+++ b/src/views/payment/system/api/PayApiConfigEdit.vue
@@ -30,9 +30,6 @@
         <a-form-item label="回调通知" v-if="form.noticeSupport" name="notice">
           <a-switch v-model:checked="form.notice" :disabled="showable" />
         </a-form-item>
-        <a-form-item label="回调签名" v-if="form.noticeSupport" name="noticeSign">
-          <a-switch v-model:checked="form.noticeSign" :disabled="showable" />
-        </a-form-item>
         <a-form-item label="默认回调地址" v-if="form.noticeSupport" name="noticeUrl">
           <a-input v-model:value="form.noticeUrl" :disabled="showable" placeholder="请输入回调地址" />
         </a-form-item>
diff --git a/src/views/payment/system/api/PayApiConfigList.vue b/src/views/payment/system/api/PayApiConfigList.vue
index 2c2f00914e1672a3e51dd9b5eaf43271fc001d65..8f5f4b991de1cd3900908c1a4190de9db406b526 100644
--- a/src/views/payment/system/api/PayApiConfigList.vue
+++ b/src/views/payment/system/api/PayApiConfigList.vue
@@ -4,22 +4,22 @@
       <vxe-toolbar ref="xToolbar" custom :refresh="{ query: queryPage }" />
       <vxe-table row-id="id" ref="xTable" :data="records" :loading="loading">
         <vxe-column type="seq" width="60" />
-        <vxe-column field="code" title="编码" />
-        <vxe-column field="name" title="名称" />
-        <vxe-column field="api" title="接口地址" />
-        <vxe-column field="enable" title="启用接口">
+        <vxe-column field="code" title="编码" :min-width="170" />
+        <vxe-column field="name" title="名称" :min-width="170" />
+        <vxe-column field="api" title="接口地址" :min-width="220" />
+        <vxe-column field="enable" title="启用接口" :min-width="100">
           <template #default="{ row }">
             <a-tag v-if="row.enable" color="green">启用</a-tag>
             <a-tag v-else color="red">停用</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="reqSign" title="参数签名">
+        <vxe-column field="reqSign" title="参数签名" :min-width="100">
           <template #default="{ row }">
-            <a-tag v-if="row.reqSign" color="green">启用</a-tag>
-            <a-tag v-else color="red">停用</a-tag>
+            <a-tag v-if="row.reqSign" color="green">校验</a-tag>
+            <a-tag v-else color="red">不校验</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="notice" title="回调通知">
+        <vxe-column field="notice" title="回调通知" :min-width="100">
           <template #default="{ row }">
             <template v-if="row.noticeSupport">
               <a-tag v-if="row.notice" color="green">启用</a-tag>
@@ -30,16 +30,7 @@
             </template>
           </template>
         </vxe-column>
-        <vxe-column field="noticeSign" title="回调签名">
-          <template #default="{ row }">
-            <template v-if="row.noticeSupport">
-              <a-tag v-if="row.noticeSign" color="green">启用</a-tag>
-              <a-tag v-else color="red">停用</a-tag>
-            </template>
-            <template v-else> </template>
-          </template>
-        </vxe-column>
-        <vxe-column field="noticeUrl" title="默认回调地址">
+        <vxe-column field="noticeUrl" title="默认回调地址" :min-width="220">
           <template #default="{ row }">
             <template v-if="row.noticeSupport">
               {{ row.noticeUrl }}
@@ -47,8 +38,8 @@
             <template v-else> </template>
           </template>
         </vxe-column>
-        <vxe-column field="remark" title="备注" />
-        <vxe-column fixed="right" width="100" :showOverflow="false" title="操作">
+        <vxe-column field="remark" title="备注" :min-width="160" />
+        <vxe-column fixed="right" width="100" :showOverflow="false" title="操作" :min-width="170">
           <template #default="{ row }">
             <span>
               <a-link @click="show(row)">查看</a-link>
@@ -113,6 +104,7 @@
       records = data
       loading.value = false
     })
+    return Promise.resolve()
   }
   // 编辑
   function edit(record) {
diff --git a/src/views/payment/system/way/PayWayInfo.api.ts b/src/views/payment/system/method/PayMethodInfo.api.ts
similarity index 65%
rename from src/views/payment/system/way/PayWayInfo.api.ts
rename to src/views/payment/system/method/PayMethodInfo.api.ts
index 00364c87bb009c6d015f7b4ecf1badbf932cb7fa..9b3b370e71f5998f3e6da6074bb624599616a80f 100644
--- a/src/views/payment/system/way/PayWayInfo.api.ts
+++ b/src/views/payment/system/method/PayMethodInfo.api.ts
@@ -6,8 +6,8 @@ import { BaseEntity } from '/#/web'
  * 列表
  */
 export function findAll() {
-  return defHttp.get<Result<PayWayInfo[]>>({
-    url: '/pay/way/info/findAll',
+  return defHttp.get<Result<PayMethodInfo[]>>({
+    url: '/pay/method/info/findAll',
   })
 }
 
@@ -15,8 +15,8 @@ export function findAll() {
  * 获取单条
  */
 export function get(id) {
-  return defHttp.get<Result<PayWayInfo>>({
-    url: '/pay/way/info/findById',
+  return defHttp.get<Result<PayMethodInfo>>({
+    url: '/pay/method/info/findById',
     params: { id },
   })
 }
@@ -24,7 +24,7 @@ export function get(id) {
 /**
  * 更新
  */
-export function update(param: PayWayInfo) {
+export function update(param: PayMethodInfo) {
   return defHttp.post<Result<void>>({
     url: '/pay/way/info/update',
     data: param,
@@ -34,7 +34,7 @@ export function update(param: PayWayInfo) {
 /**
  * 支付通道信息
  */
-export interface PayWayInfo extends BaseEntity {
+export interface PayMethodInfo extends BaseEntity {
   // 通道编码
   code?: string
   // 支付通道名称
diff --git a/src/views/payment/system/way/PayWayInfoEdit.vue b/src/views/payment/system/method/PayMethodInfoEdit.vue
similarity index 96%
rename from src/views/payment/system/way/PayWayInfoEdit.vue
rename to src/views/payment/system/method/PayMethodInfoEdit.vue
index 90e2304cbef8a017298217a71516ccd374568356..95865424473cde92fda390910549876ed954e20a 100644
--- a/src/views/payment/system/way/PayWayInfoEdit.vue
+++ b/src/views/payment/system/method/PayMethodInfoEdit.vue
@@ -46,7 +46,7 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   import { nextTick } from 'vue'
   import { FormInstance } from 'ant-design-vue/lib/form'
-  import { get, PayWayInfo, update } from './PayWayInfo.api'
+  import { get, PayMethodInfo, update } from './PayMethodInfo.api'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { getFilePreviewUrlPrefix } from '/@/api/common/FileUpload'
   import { BasicModal } from '/@/components/Modal'
@@ -73,7 +73,7 @@
   // 表单
   const formRef = $ref<FormInstance>()
   let urlPrefix = $ref<string>()
-  let form = $ref<PayWayInfo>({
+  let form = $ref<PayMethodInfo>({
     code: '',
     name: '',
     remark: '',
diff --git a/src/views/payment/system/way/PayWayInfoList.vue b/src/views/payment/system/method/PayMethodInfoList.vue
similarity index 93%
rename from src/views/payment/system/way/PayWayInfoList.vue
rename to src/views/payment/system/method/PayMethodInfoList.vue
index 3fc50783867f32d98f46bed0193e85972891e62b..3593547372d21c420be47c2cd4d2344d485cb206 100644
--- a/src/views/payment/system/way/PayWayInfoList.vue
+++ b/src/views/payment/system/method/PayMethodInfoList.vue
@@ -29,11 +29,11 @@
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { $ref } from 'vue/macros'
-  import { findAll, PayWayInfo } from './PayWayInfo.api'
+  import { findAll, PayMethodInfo } from './PayMethodInfo.api'
   import { onMounted } from 'vue'
   import { getFilePreviewUrlPrefix } from '/@/api/common/FileUpload'
   import { FormEditType } from '/@/enums/formTypeEnum'
-  import PayWayInfoEdit from './PayWayInfoEdit.vue'
+  import PayWayInfoEdit from './PayMethodInfoEdit.vue'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
@@ -44,7 +44,7 @@
   const payWayInfoEdit = $ref<any>()
 
   let urlPrefix = $ref<string>()
-  let records = $ref<PayWayInfo[]>([])
+  let records = $ref<PayMethodInfo[]>([])
 
   onMounted(() => {
     vxeBind()
diff --git a/src/views/payment/task/notice/ClientNoticeRecordList.vue b/src/views/payment/task/notice/ClientNoticeRecordList.vue
index d0970a16b09b74862353da3502df238565fb5a57..9b82a67746d03300d6626feed19d5e883ca75b19 100644
--- a/src/views/payment/task/notice/ClientNoticeRecordList.vue
+++ b/src/views/payment/task/notice/ClientNoticeRecordList.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-drawer forceRender v-bind="$attrs" title="通道订单列表" width="60%" :visible="visible" @close="visible = false">
+  <basic-drawer forceRender v-bind="$attrs" title="通知明细列表" width="60%" :visible="visible" @close="visible = false">
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
     <vxe-table
       row-id="id"
@@ -60,10 +60,9 @@
   import ClientNoticeRecordInfo from './ClientNoticeRecordInfo.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, sortChange, resetQueryParams, pagination, pages, sortParam, model, loading } =
-    useTablePage(queryPage)
+  const { handleTableChange, pageQueryResHandel, sortChange, pagination, sortParam, loading } = useTablePage(queryPage)
   const { notification, createMessage } = useMessage()
-  const { dictDropDown, dictConvert } = useDict()
+  const { dictConvert } = useDict()
 
   let visible = $ref(false)
   let task = $ref<ClientNoticeTask>({})
diff --git a/src/views/payment/task/notice/ClientNoticeTask.api.ts b/src/views/payment/task/notice/ClientNoticeTask.api.ts
index e2d5de564cb8d61cc48c43add3b5bf8594f87236..ec5f301f46b57737f8c0ae918a11695663e04a1b 100644
--- a/src/views/payment/task/notice/ClientNoticeTask.api.ts
+++ b/src/views/payment/task/notice/ClientNoticeTask.api.ts
@@ -59,10 +59,14 @@ export function getRecord(id) {
  * 消息通知任务
  */
 export interface ClientNoticeTask extends BaseEntity {
-  // 本地订单ID
-  orderId?: number
+  // 本地交易ID
+  tradeId?: string
+  // 本地交易ID
+  tradeNo?: string
   // 消息类型
   noticeType?: string
+  // 交易状态
+  tradeStatus?: string
   // 消息内容
   content?: string
   // 是否发送成功
@@ -87,6 +91,8 @@ export interface ClientNoticeRecord extends BaseEntity {
   sendType?: boolean
   // 发送是否成功
   success?: boolean
+  // 错误编码
+  errorCode?: string
   // 错误信息
   errorMsg?: string
 }
diff --git a/src/views/payment/task/notice/ClientNoticeTaskInfo.vue b/src/views/payment/task/notice/ClientNoticeTaskInfo.vue
index b2a9599865778437f81d409b083c847e213d4aa8..19aaf1fcb2c4aa48433a48eef11ce39036a68fdb 100644
--- a/src/views/payment/task/notice/ClientNoticeTaskInfo.vue
+++ b/src/views/payment/task/notice/ClientNoticeTaskInfo.vue
@@ -3,45 +3,42 @@
     title="查看通知任务"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="modalWidth"
+    :width="1200"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="主键">
-          <a-tag>{{ task.id }}</a-tag>
+      <a-descriptions title="" bordered>
+        <a-descriptions-item label="本地订单ID" :span="2">
+          <a-tag>{{ task.tradeNo }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="本地订单ID">
-          <a-tag>{{ task.orderId }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="回调类型">
+        <a-descriptions-item label="回调类型" :span="2">
           <a-tag>{{ dictConvert('ClientNoticeType', task.noticeType) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="订单状态">
-          <a-tag v-if="task.noticeType === 'pay'">{{ dictConvert('PayStatus', task.orderStatus) || '未知' }}</a-tag>
-          <a-tag v-else>{{ dictConvert('RefundStatus', task.orderStatus) || '未知' }}</a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="消息内容">
-          <json-preview :data="JSON.parse(task.content || '{}')" />
+        <a-descriptions-item label="交易状态" :span="2">
+          <a-tag v-if="task.noticeType === 'pay'">{{ dictConvert('PayStatus', task.tradeStatus) || '未知' }}</a-tag>
+          <a-tag v-else>{{ dictConvert('RefundStatus', task.tradeStatus) || '未知' }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="是否发送成功">
+        <a-descriptions-item label="是否发送成功" :span="2">
           <a-tag v-if="task.success" color="green">是</a-tag>
           <a-tag v-else color="red">否</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="发送次数">
+        <a-descriptions-item label="发送次数" :span="2">
           {{ task.sendCount }}
         </a-descriptions-item>
-        <a-descriptions-item label="发送地址">
+        <a-descriptions-item label="发送地址" :span="2">
           {{ task.url }}
         </a-descriptions-item>
-        <a-descriptions-item label="最后发送时间">
+        <a-descriptions-item label="最后发送时间" :span="2">
           {{ task.latestTime }}
         </a-descriptions-item>
-        <a-descriptions-item label="创建时间">
+        <a-descriptions-item label="创建时间" :span="2">
           {{ task.createTime }}
         </a-descriptions-item>
+        <a-descriptions-item label="消息内容" :span="4">
+          <json-preview :data="JSON.parse(task.content || '{}')" />
+        </a-descriptions-item>
       </a-descriptions>
     </a-spin>
     <template #footer>
@@ -60,18 +57,10 @@
   import { useDict } from '/@/hooks/bootx/useDict'
   import JsonPreview from '/@/components/CodeEditor/src/json-preview/JsonPreview.vue'
   const {
-    initFormEditType,
     handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
     confirmLoading,
     visible,
-    editable,
     showable,
-    formEditType,
   } = useFormEdit()
   const { dictConvert } = useDict()
 
diff --git a/src/views/payment/task/notice/ClientNoticeTaskList.vue b/src/views/payment/task/notice/ClientNoticeTaskList.vue
index e4ec347b6db26461bf785fceb637e766ffe9fbaa..5612a685e49bd57923a343ef5f90f6a7250ad186 100644
--- a/src/views/payment/task/notice/ClientNoticeTaskList.vue
+++ b/src/views/payment/task/notice/ClientNoticeTaskList.vue
@@ -14,34 +14,33 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="orderId" title="本地订单ID" width="170">
+        <vxe-column field="orderId" title="本地交易号" :min-width="220">
           <template #default="{ row }">
             <a-link @click="showOrder(row)">
-              {{ row.orderId }}
+              {{ row.tradeNo }}
             </a-link>
           </template>
         </vxe-column>
-        <vxe-column field="noticeType" title="消息类型">
+        <vxe-column field="noticeType" title="消息类型" :min-width="170">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('ClientNoticeType', row.noticeType) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="success" title="订单状态">
+        <vxe-column field="tradeStatus" title="交易状态" :min-width="170">
           <template #default="{ row }">
-            <a-tag v-if="row.noticeType === 'pay'">{{ dictConvert('PayStatus', row.orderStatus) || '未知' }}</a-tag>
-            <a-tag v-else>{{ dictConvert('RefundStatus', row.orderStatus) || '未知' }}</a-tag>
+            <a-tag v-if="row.noticeType === 'pay'">{{ dictConvert('PayStatus', row.tradeStatus) || '未知' }}</a-tag>
+            <a-tag v-else>{{ dictConvert('RefundStatus', row.tradeStatus) || '未知' }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="success" title="发送成功">
+        <vxe-column field="success" title="发送成功" sortable :min-width="170">
           <template #default="{ row }">
             <a-tag v-if="row.success" color="green">是</a-tag>
             <a-tag v-else color="red">否</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="sendCount" title="发送次数" sortable />
-        <vxe-column field="latestTime" title="最后发送时间" sortable />
-        <vxe-column field="url" title="发送地址" />
-        <vxe-column field="createTime" title="创建时间" sortable />
+        <vxe-column field="sendCount" title="发送次数" sortable :min-width="170" />
+        <vxe-column field="latestTime" title="最后发送时间" sortable :min-width="170" />
+        <vxe-column field="createTime" title="创建时间" sortable :min-width="170" />
         <vxe-column fixed="right" width="180" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
@@ -83,16 +82,21 @@
   import ClientNoticeTaskInfo from '/@/views/payment/task/notice/ClientNoticeTaskInfo.vue'
   import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
   import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.vue'
+  import { LabeledValue } from 'ant-design-vue/lib/select'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, sortChange, resetQueryParams, pagination, pages, sortParam, model, loading } =
     useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
+  const { createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
+  let noticeTypeList = $ref<LabeledValue[]>([])
 
   // 查询条件
   const fields = computed(() => {
-    return [{ field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入完整本地订单ID' }] as QueryField[]
+    return [
+      { field: 'tradeNo', type: STRING, name: '本地交易号', placeholder: '请输入完整本地交易号' },
+      { field: 'noticeType', type: LIST, name: '消息类型', placeholder: '请选择消息类型', selectList: noticeTypeList },
+    ] as QueryField[]
   })
 
   const clientNoticeRecordList = $ref<any>()
@@ -104,12 +108,20 @@
 
   onMounted(() => {
     vxeBind()
+    init()
     queryPage()
   })
   function vxeBind() {
     xTable?.connect(xToolbar as VxeToolbarInstance)
   }
 
+  /**
+   * 初始化
+   */
+  async function init() {
+    noticeTypeList = await dictDropDown('ClientNoticeType')
+  }
+
   /**
    * 分页查询
    */
@@ -149,7 +161,7 @@
     clientNoticeTaskInfo.init(record)
   }
   /**
-   * 查看记录
+   * 查看记录列表
    */
   function showRecord(record) {
     clientNoticeRecordList.init(record)
@@ -159,9 +171,9 @@
    */
   function showOrder(record: ClientNoticeTask) {
     if (record.noticeType === 'pay') {
-      payOrderInfo.init(record.orderId)
+      payOrderInfo.init(record.tradeNo)
     } else {
-      refundOrderInfo.init(record.orderId)
+      refundOrderInfo.init(record.tradeNo)
     }
   }
 </script>