diff --git a/src/settings/siteSetting.ts b/src/settings/siteSetting.ts
index ec0cd798995619697251aa5119ce66f46df59b41..0ae290dc5fd847b74de4f12c00803d6ee8ecd3ed 100644
--- a/src/settings/siteSetting.ts
+++ b/src/settings/siteSetting.ts
@@ -1,11 +1,11 @@
 // github repo url
-export const GITHUB_URL = 'https://github.com/xxm1995/bootx-platform'
+export const GITHUB_URL = 'https://github.com/dromara/dax-pay'
 
 // gitee repo url
-export const GITEE_URL = 'https://gitee.com/bootx/bootx-platform'
+export const GITEE_URL = 'https://gitee.com/dromara/dax-pay'
 
 // 文档地址
-export const DOC_URL = 'https://gitee.com/bootx/bootx-platform'
+export const DOC_URL = 'https://bootx.gitee.io/'
 
 // 预览地址
-export const SITE_URL = 'http://v3.platform.bootx.cn/'
+export const SITE_URL = 'https://daxpay.demo.bootx.cn/'
diff --git a/src/views/payment/channel/alipay/record/AlipayRecord.api.ts b/src/views/payment/channel/alipay/record/AlipayRecord.api.ts
index b975a99d713780495a1d9d0817cfd69ad6c53473..551dc629920d0ded9f806222692ee012fc192043 100644
--- a/src/views/payment/channel/alipay/record/AlipayRecord.api.ts
+++ b/src/views/payment/channel/alipay/record/AlipayRecord.api.ts
@@ -38,4 +38,6 @@ export interface AlipayRecord extends BaseEntity {
   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
index 9eeb08d87cec70811e8137a940af455b28bb19e8..5ef9cac798f28f2b383f2617ad2950d15e8b3f97 100644
--- a/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
+++ b/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
@@ -25,6 +25,9 @@
         <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>
diff --git a/src/views/payment/channel/alipay/record/AlipayRecordList.vue b/src/views/payment/channel/alipay/record/AlipayRecordList.vue
index 20e5d7c78fba181bedaaa8c5ef19b56078f97f94..0a2626548a800de5c6ad9bf8795ec25feecf510e 100644
--- a/src/views/payment/channel/alipay/record/AlipayRecordList.vue
+++ b/src/views/payment/channel/alipay/record/AlipayRecordList.vue
@@ -23,7 +23,7 @@
         <vxe-column field="amount" title="金额" />
         <vxe-column field="orderId" title="本地订单ID" width="170" />
         <vxe-column field="gatewayOrderNo" title="网关订单号" width="170" />
-        <vxe-column field="createTime" title="记录时间" sortable />
+        <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>
diff --git a/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts b/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts
index c88f51404ceadd0338691f2d909d046f4fc97f0e..28cdaa2f07175d52ff2a8d67c58392e19e510d9c 100644
--- a/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts
+++ b/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts
@@ -38,4 +38,6 @@ export interface WechatPayRecord extends BaseEntity {
   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
index 667ceb8125521031633f59037cda372a86455100..16b3097eaf4a5316334ba4ca94ee5b96619ed9f8 100644
--- a/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
+++ b/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
@@ -25,6 +25,9 @@
         <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>
diff --git a/src/views/payment/channel/wechat/record/WechatPayRecordList.vue b/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
index de9e37ba98cdbab93e55303c08a08a4e8259894d..b97b843ab07179f5cb435c7cdbddb282c4f2502d 100644
--- a/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
+++ b/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
@@ -23,7 +23,7 @@
         <vxe-column field="amount" title="金额" />
         <vxe-column field="orderId" title="本地订单ID" width="170" />
         <vxe-column field="gatewayOrderNo" title="网关订单号" width="170" />
-        <vxe-column field="createTime" title="记录时间" sortable />
+        <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>
diff --git a/src/views/payment/order/pay/PayOrderList.vue b/src/views/payment/order/pay/PayOrderList.vue
index 1faf77087ddde06646cc45f2c4222a6526675694..73fc9819b56290640d4ecf89dcc504d7e449f3a3 100644
--- a/src/views/payment/order/pay/PayOrderList.vue
+++ b/src/views/payment/order/pay/PayOrderList.vue
@@ -110,7 +110,7 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'paymentId', type: STRING, name: '支付ID', placeholder: '请输入完整支付ID' },
+      { field: 'id', type: STRING, name: '支付ID', placeholder: '请输入完整支付ID' },
       { field: 'businessNo', type: STRING, name: '业务号', placeholder: '请输入业务号' },
       { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
       { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts b/src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts
new file mode 100644
index 0000000000000000000000000000000000000000..65b013c39b3fb1d2db6f0032b792eb10ecf2a6fb
--- /dev/null
+++ b/src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts
@@ -0,0 +1,43 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 明细分页
+ */
+export function page(params) {
+  return defHttp.get<Result<PageResult<ReconcileDetail>>>({
+    url: '/order/reconcile/detail/page',
+    params,
+  })
+}
+
+/**
+ * 明细详情
+ */
+export function get(id: string) {
+  return defHttp.get<Result<ReconcileDetail>>({
+    url: '/order/reconcile/detail/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 通用支付对账记录
+ */
+export interface ReconcileDetail extends BaseEntity {
+  // 关联对账订单ID
+  recordOrderId?: string
+  // 交易类型
+  type?: string
+  // 订单id
+  paymentId?: string
+  // 订单id
+  refundId?: string
+  // 网关订单号
+  gatewayOrderNo?: string
+  // 交易金额
+  amount?: string
+  // 商品名称
+  title?: string
+}
diff --git a/src/views/payment/order/reconcile/ReconcileDetailInfo.vue b/src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
similarity index 82%
rename from src/views/payment/order/reconcile/ReconcileDetailInfo.vue
rename to src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
index 709fb72d923d55b024a10646b0b42b07a2ea283e..ba63d63d538308746156da0b34394a7434603344 100644
--- a/src/views/payment/order/reconcile/ReconcileDetailInfo.vue
+++ b/src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
@@ -15,17 +15,14 @@
       <a-descriptions-item label="交易金额">
         {{ form.amount }}
       </a-descriptions-item>
-      <a-descriptions-item label="支付订单ID">
-        {{ form.paymentId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="退款订单ID" v-if="form.refundId">
-        {{ form.refundId }}
+      <a-descriptions-item label="本地订单ID">
+        {{ form.orderId }}
       </a-descriptions-item>
       <a-descriptions-item label="网关订单号">
         {{ form.gatewayOrderNo }}
       </a-descriptions-item>
       <a-descriptions-item label="交易类型">
-        <a-tag>{{ dictConvert('PayReconcileTrade', form.type) }}</a-tag>
+        <a-tag>{{ dictConvert('ReconcileTrade', form.type) }}</a-tag>
       </a-descriptions-item>
       <a-descriptions-item label="创建时间">
         {{ form.createTime }}
@@ -44,7 +41,7 @@
   import { FormInstance } from 'ant-design-vue/lib/form'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
-  import { getDetail, ReconcileDetail } from './ReconcileOrder.api'
+  import { get, ReconcileDetail } from './ReconcileDetail.api'
   const {
     initFormEditType,
     handleCancel,
@@ -70,7 +67,7 @@
   function init(record) {
     visible.value = true
     confirmLoading.value = true
-    getDetail(record.id).then(({ data }) => {
+    get(record.id).then(({ data }) => {
       form = data
       confirmLoading.value = false
     })
diff --git a/src/views/payment/order/reconcile/ReconcileDetailList.vue b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
similarity index 76%
rename from src/views/payment/order/reconcile/ReconcileDetailList.vue
rename to src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
index 24eed735cf69a94504a51bce9785d2167abcc6c2..4351a19f1ca530473ef76233dbaf225756e9b38d 100644
--- a/src/views/payment/order/reconcile/ReconcileDetailList.vue
+++ b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
@@ -2,23 +2,29 @@
   <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">
+    <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" width="60" />
-      <vxe-column field="title" title="商品名称" />
+      <vxe-column field="title" title="订单名称" />
       <vxe-column field="amount" title="交易金额" />
-      <vxe-column field="paymentId" title="支付订单ID" />
-      <vxe-column field="refundId" title="退款订单ID" />
+      <vxe-column field="orderId" title="本地订单ID" />
       <vxe-column field="gatewayOrderNo" title="网关订单号" />
       <vxe-column field="repairType" title="交易类型">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('PayReconcileTrade', row.type) }}</a-tag>
+          <a-tag>{{ dictConvert('ReconcileTrade', row.type) }}</a-tag>
         </template>
       </vxe-column>
-      <vxe-column field="createTime" title="创建时间" />
+      <vxe-column field="orderTime" title="订单时间" sortable />
       <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
         <template #default="{ row }">
           <span>
-            <a href="javascript:" @click="show(row)">查看</a>
+            <a-link @click="show(row)">查看</a-link>
           </span>
         </template>
       </vxe-column>
@@ -38,19 +44,21 @@
 <script setup lang="ts">
   import { computed, nextTick, onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { pageDetail, ReconcileDetail } from './ReconcileOrder.api'
+  import { page, ReconcileDetail } from './ReconcileDetail.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import ReconcileDetailInfo from './ReconcileDetailInfo.vue'
-  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  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 ALink from '/@/components/Link/Link.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, pages, sortParam, model, loading } =
+    useTablePage(queryPage)
   const { notification, createMessage } = useMessage()
   const { dictDropDown, dictConvert } = useDict()
 
@@ -60,10 +68,9 @@
   const fields = computed(() => {
     return [
       { field: 'title', type: STRING, name: '订单名称', placeholder: '请输入订单名称' },
-      { field: 'paymentId', type: STRING, name: '本地支付ID', placeholder: '请输入本地支付ID' },
-      { field: 'refundId', type: STRING, name: '本地退款ID', placeholder: '请输入本地退款ID' },
-      { field: 'gatewayOrderNo', 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: '请输入网关订单号' },
     ] as QueryField[]
   })
   let visible = $ref(false)
@@ -85,7 +92,7 @@
    * 初始化基础数据
    */
   async function initData() {
-    reconcileTradeList = await dictDropDown('PayReconcileTrade')
+    reconcileTradeList = await dictDropDown('ReconcileTrade')
   }
   /**
    * 入口
@@ -94,6 +101,8 @@
   function init(record) {
     visible = true
     reconcileDetail = record
+    model.queryParam = {}
+    xTable?.clearSort()
     queryPage()
   }
 
@@ -102,9 +111,10 @@
    */
   function queryPage() {
     loading.value = true
-    pageDetail({
+    page({
       ...model.queryParam,
       ...pages,
+      ...sortParam,
       recordOrderId: reconcileDetail?.id,
     }).then(({ data }) => {
       pageQueryResHandel(data)
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts b/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8a01ebfdaa2f1c4555601d5378e7be49b4b2db50
--- /dev/null
+++ b/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
@@ -0,0 +1,57 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 对账差异分页
+ */
+export function page(params) {
+  return defHttp.get<Result<PageResult<ReconcileRecord>>>({
+    url: '/order/reconcile/diff/page',
+    params,
+  })
+}
+
+/**
+ * 对账差异详情
+ */
+export function get(id: string) {
+  return defHttp.get<Result<ReconcileRecord>>({
+    url: '/order/reconcile/diff/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 通用支付对账记录
+ */
+export interface ReconcileRecord extends BaseEntity {
+  // 关联对账订单ID
+  recordOrderId?: string
+  // 交易类型
+  type?: string
+  // 订单id
+  paymentId?: string
+  // 订单id
+  refundId?: string
+  // 网关订单号
+  gatewayOrderNo?: string
+  // 交易金额
+  amount?: string
+  // 商品名称
+  title?: string
+  // 差异内容
+  diffs?: ReconcileDiff[]
+}
+
+/**
+ * 差异内容
+ */
+export interface ReconcileDiff {
+  // 字段名
+  fieldName?: string
+  // 本地订单字段值
+  localValue?: string
+  // 网关订单字段值
+  gatewayValue?: string
+}
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue b/src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5380a024e18f350d79047f64687f7c0d256c2ddd
--- /dev/null
+++ b/src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue
@@ -0,0 +1,95 @@
+<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="订单标题">
+        {{ form.title }}
+      </a-descriptions-item>
+      <a-descriptions-item label="交易金额">
+        {{ form.amount }}
+      </a-descriptions-item>
+      <a-descriptions-item label="对账单ID">
+        {{ form.recordId }}
+      </a-descriptions-item>
+      <a-descriptions-item v-if="form.detailId" label="对账单明细ID">
+        {{ form.detailId }}
+      </a-descriptions-item>
+      <a-descriptions-item label="本地订单ID">
+        {{ form.orderId }}
+      </a-descriptions-item>
+      <a-descriptions-item v-if="form.gatewayOrderNo" label="网关订单号">
+        {{ form.gatewayOrderNo }}
+      </a-descriptions-item>
+      <a-descriptions-item label="订单类型">
+        <a-tag>{{ dictConvert('ReconcileTrade', form.orderType) }}</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 }}
+        </a-descriptions-item>
+      </template>
+    </a-descriptions>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+      </a-space>
+    </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 { get, ReconcileDiff, ReconcileRecord } from './ReconcileDiff.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<ReconcileOrder>({})
+
+  // 事件
+  const emits = defineEmits(['ok'])
+  // 入口
+  function init(record) {
+    visible.value = true
+    confirmLoading.value = true
+    get(record.id).then(({ data }) => {
+      form = data
+      confirmLoading.value = false
+    })
+  }
+  defineExpose({
+    init,
+  })
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffList.vue b/src/views/payment/order/reconcile/diff/ReconcileDiffList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..697c8781a2749644670e25179575af24dabb3ac3
--- /dev/null
+++ b/src/views/payment/order/reconcile/diff/ReconcileDiffList.vue
@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-5 bg-white">
+      <b-query :query-params="model.queryParam" :default-item-count="3" :fields="fields" @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="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="交易金额" />
+        <vxe-column field="orderTime" title="订单时间" />
+        <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" />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import useTablePage from '/@/hooks/bootx/useTablePage'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import { useDict } from '/@/hooks/bootx/useDict'
+  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'
+
+  // 使用hooks
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, sortParam, pagination, pages, model, loading } =
+    useTablePage(queryPage)
+  const { notification, createMessage, createConfirm } = useMessage()
+  const { dictConvert, dictDropDown } = useDict()
+
+  let payChannelList = $ref<LabeledValue[]>([])
+
+  // 查询条件
+  const fields = computed(() => {
+    return [
+      { field: 'title', type: DATE, name: '订单标题', placeholder: '请输入订单标题' },
+    ] as QueryField[]
+  })
+
+  const xTable = $ref<VxeTableInstance>()
+  const xToolbar = $ref<VxeToolbarInstance>()
+  const reconcileDiffInfo = $ref<any>()
+
+  onMounted(() => {
+    initData()
+    vxeBind()
+    queryPage()
+  })
+  function vxeBind() {
+    xTable?.connect(xToolbar as VxeToolbarInstance)
+  }
+
+  /**
+   * 初始化数据
+   */
+  async function initData() {
+    payChannelList = await dictDropDown('AsyncPayChannel')
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+      ...sortParam,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+    return Promise.resolve()
+  }
+  /**
+   * 查看详情
+   */
+  function show(record) {
+    reconcileDiffInfo.init(record)
+  }
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue b/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5258197922462499eb7d2a48ecddc18fad45f32f
--- /dev/null
+++ b/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
@@ -0,0 +1,139 @@
+<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/reconcile/ReconcileOrder.api.ts b/src/views/payment/order/reconcile/order/ReconcileOrder.api.ts
similarity index 62%
rename from src/views/payment/order/reconcile/ReconcileOrder.api.ts
rename to src/views/payment/order/reconcile/order/ReconcileOrder.api.ts
index 17492e5bd23730c2d2dd9196bdc614db576d6456..436a8a092af26ef14eb6420d8f1a13f4e5ea5d26 100644
--- a/src/views/payment/order/reconcile/ReconcileOrder.api.ts
+++ b/src/views/payment/order/reconcile/order/ReconcileOrder.api.ts
@@ -33,31 +33,21 @@ export function get(id: string) {
 }
 
 /**
- * 明细分页
- */
-export function pageDetail(params) {
-  return defHttp.get<Result<PageResult<ReconcileDetail>>>({
-    url: '/order/reconcile/pageDetail',
-    params,
-  })
-}
-
-/**
- * 明细详情
+ * 下载对账单
  */
-export function getDetail(id: string) {
-  return defHttp.get<Result<ReconcileDetail>>({
-    url: '/order/reconcile/findDetailById',
+export function downAndSave(id: any) {
+  return defHttp.post<any>({
+    url: '/order/reconcile/downAndSave',
     params: { id },
   })
 }
 
 /**
- * 下载对账单
+ * 对账单比对
  */
-export function downAndSave(id: any) {
+export function compare(id: any) {
   return defHttp.post<any>({
-    url: '/order/reconcile/downAndSave',
+    url: '/order/reconcile/compare',
     params: { id },
   })
 }
@@ -79,23 +69,3 @@ export interface ReconcileOrder extends BaseEntity {
   // 错误信息
   errorMsg?: string
 }
-
-/**
- * 通用支付对账记录
- */
-export interface ReconcileDetail extends BaseEntity {
-  // 关联对账订单ID
-  recordOrderId?: string
-  // 交易类型
-  type?: string
-  // 订单id
-  paymentId?: string
-  // 订单id
-  refundId?: string
-  // 网关订单号
-  gatewayOrderNo?: string
-  // 交易金额
-  amount?: string
-  // 商品名称
-  title?: string
-}
diff --git a/src/views/payment/order/reconcile/ReconcileOrderCreate.vue b/src/views/payment/order/reconcile/order/ReconcileOrderCreate.vue
similarity index 100%
rename from src/views/payment/order/reconcile/ReconcileOrderCreate.vue
rename to src/views/payment/order/reconcile/order/ReconcileOrderCreate.vue
diff --git a/src/views/payment/order/reconcile/ReconcileOrderInfo.vue b/src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue
similarity index 100%
rename from src/views/payment/order/reconcile/ReconcileOrderInfo.vue
rename to src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue
diff --git a/src/views/payment/order/reconcile/ReconcileOrderList.vue b/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
similarity index 72%
rename from src/views/payment/order/reconcile/ReconcileOrderList.vue
rename to src/views/payment/order/reconcile/order/ReconcileOrderList.vue
index 4b3c629b9bee87067347c0bfeeff5ed4ec24260f..f81cd6b7db70fbaa843f8fb171f00bc70b599084 100644
--- a/src/views/payment/order/reconcile/ReconcileOrderList.vue
+++ b/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
@@ -36,15 +36,27 @@
         <vxe-column field="compare" title="对账单比对">
           <template #default="{ row }">
             <a-tag v-if="row.compare" color="green">已比对</a-tag>
-            <a-link v-else :disabled="!row.down" color="red" @click="compare(row)">比对</a-link>
+            <a-link v-else :disabled="!row.down" color="red" @click="compareOrder(row)">比对</a-link>
           </template>
         </vxe-column>
         <vxe-column field="errorMsg" title="错误信息" />
-        <vxe-column fixed="right" width="140" :showOverflow="false" title="操作">
+        <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="showDetailPage(row)">对账明细</a-link>
+            <a-dropdown>
+              <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-menu-item>
+                  <a-menu-item>
+                    <a-link @click="showDiffPage(row)">差异明细</a-link>
+                  </a-menu-item>
+                </a-menu>
+              </template>
+            </a-dropdown>
           </template>
         </vxe-column>
       </vxe-table>
@@ -60,6 +72,7 @@
     <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">
@@ -71,13 +84,16 @@
   import { computed, onMounted } from 'vue'
   import { DATE, LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { downAndSave, page } from './ReconcileOrder.api'
+  import { compare, downAndSave, page } from './ReconcileOrder.api'
   import ReconcileOrderInfo from './ReconcileOrderInfo.vue'
-  import ReconcileDetailList from './ReconcileDetailList.vue'
-  import ReconcileOrderCreate from '/@/views/payment/order/reconcile/ReconcileOrderCreate.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'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, sortParam, pagination, pages, model, loading } = useTablePage(queryPage)
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, sortParam, pagination, pages, model, loading } =
+    useTablePage(queryPage)
   const { notification, createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
@@ -103,6 +119,7 @@
   const reconcileOrderCreate = $ref<any>()
   const reconcileOrderInfo = $ref<any>()
   const reconcileDetailList = $ref<any>()
+  const reconcileDiffListModel = $ref<any>()
 
   onMounted(() => {
     initData()
@@ -151,10 +168,13 @@
       content: '确定要下载对账单吗？',
       onOk: () => {
         createMessage.info('对账单下载保存中.....')
-        downAndSave(record.id).then(() => {
-          createMessage.info('对账单下载完成')
-          queryPage()
-        })
+        downAndSave(record.id)
+          .then(() => {
+            createMessage.info('对账单下载完成')
+          })
+          .finally(() => {
+            queryPage()
+          })
       },
     })
   }
@@ -162,8 +182,22 @@
   /**
    * 对账明显比对
    */
-  function compare(record) {
-    createMessage.warn('下个版本支持...')
+  function compareOrder(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '提示',
+      content: '确定要进行比对吗？',
+      onOk: () => {
+        createMessage.info('对账单比对中.....')
+        compare(record.id)
+          .then(() => {
+            createMessage.info('对账单比对完成')
+          })
+          .finally(() => {
+            queryPage()
+          })
+      },
+    })
   }
 
   /**
@@ -179,6 +213,13 @@
   function showDetailPage(record) {
     reconcileDetailList.init(record)
   }
+
+  /**
+   * 查看差异单
+   */
+  function showDiffPage(record) {
+    reconcileDiffListModel.init(record)
+  }
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/views/payment/order/refund/RefundOrderList.vue b/src/views/payment/order/refund/RefundOrderList.vue
index 5fb3d95b0e67d659d0dd2b010ad3cafeadb2a177..76d717197b6b64ff24af8e3d010ba8dfb0d97ca5 100644
--- a/src/views/payment/order/refund/RefundOrderList.vue
+++ b/src/views/payment/order/refund/RefundOrderList.vue
@@ -99,8 +99,9 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'id', type: STRING, name: '退款号', placeholder: '请输入完整退款号' },
-      { field: 'paymentId', type: STRING, name: '原支付单号', placeholder: '请输入完整支付ID' },
+      { 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: 'title', type: STRING, name: '原支付标题', placeholder: '请输入原支付标题' },
diff --git a/src/views/sys/about/index.vue b/src/views/sys/about/index.vue
index 26f45a172d4ea182bb2a68d7faa4d54921d7eb93..acdb4a6576d51df74946009c11308e5586428d36 100644
--- a/src/views/sys/about/index.vue
+++ b/src/views/sys/about/index.vue
@@ -3,9 +3,8 @@
     <template #headerContent>
       <div class="flex justify-between items-center">
         <span class="flex-1">
-          <a :href="GITHUB_URL" target="_blank">Bootx-Platform </a>
-          是一个基于Spring Boot、Vue、Ant-Design-Vue
-          、TypeScript的后台管理脚手架，包含支付收单(支付宝、微信、聚合、组合支付)、工作流(Flowable)、三方对接(微信、钉钉、企微、短信)等功能。
+          <a :href="GITHUB_URL" target="_blank">dax-pay </a>
+          是一款免费开源的支付网关，独立部署通过HTTP方式进行调用，不与其他系统产生耦合关联，可以快速集成到各种系统中，提供可视化界面进行管理，便于实现统一的支付信息管理。
         </span>
       </div>
     </template>