From 73183f0509841795b749d2f00f4b85542157972b Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Tue, 27 Feb 2024 23:46:07 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/order/pay/PayOrderList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/payment/order/pay/PayOrderList.vue b/src/views/payment/order/pay/PayOrderList.vue
index 1faf7708..73fc9819 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: '请输入标题' },
-- 
Gitee


From 28456e9fbd816dc5ca8963dc1351561e73c238bc Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Wed, 28 Feb 2024 17:02:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat=20=E6=B5=81=E6=B0=B4=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4,=20=E5=AF=B9=E8=B4=A6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings/siteSetting.ts                           |  8 ++++----
 .../payment/channel/alipay/record/AlipayRecord.api.ts |  2 ++
 .../channel/alipay/record/AlipayRecordInfo.vue        |  3 +++
 .../channel/alipay/record/AlipayRecordList.vue        |  2 +-
 .../channel/wechat/record/WechatPayRecord.api.ts      |  2 ++
 .../channel/wechat/record/WechatPayRecordInfo.vue     |  3 +++
 .../channel/wechat/record/WechatPayRecordList.vue     |  2 +-
 .../payment/order/reconcile/ReconcileOrder.api.ts     | 10 ++++++++++
 .../payment/order/reconcile/ReconcileOrderList.vue    | 11 +++++++----
 src/views/payment/order/refund/RefundOrderList.vue    |  5 +++--
 src/views/sys/about/index.vue                         |  5 ++---
 11 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/settings/siteSetting.ts b/src/settings/siteSetting.ts
index ec0cd798..0ae290dc 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 b975a99d..551dc629 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 9eeb08d8..5ef9cac7 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 20e5d7c7..0a262654 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 c88f5140..28cdaa2f 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 667ceb81..16b3097e 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 de9e37ba..b97b843a 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/reconcile/ReconcileOrder.api.ts b/src/views/payment/order/reconcile/ReconcileOrder.api.ts
index 17492e5b..e1da60ca 100644
--- a/src/views/payment/order/reconcile/ReconcileOrder.api.ts
+++ b/src/views/payment/order/reconcile/ReconcileOrder.api.ts
@@ -62,6 +62,16 @@ export function downAndSave(id: any) {
   })
 }
 
+/**
+ * 下载对账单
+ */
+export function compare(id: any) {
+  return defHttp.post<any>({
+    url: '/order/reconcile/compare',
+    params: { id },
+  })
+}
+
 /**
  * 支付对账订单
  */
diff --git a/src/views/payment/order/reconcile/ReconcileOrderList.vue b/src/views/payment/order/reconcile/ReconcileOrderList.vue
index 4b3c629b..a6d41a6d 100644
--- a/src/views/payment/order/reconcile/ReconcileOrderList.vue
+++ b/src/views/payment/order/reconcile/ReconcileOrderList.vue
@@ -36,7 +36,7 @@
         <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="错误信息" />
@@ -71,7 +71,7 @@
   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'
@@ -162,8 +162,11 @@
   /**
    * 对账明显比对
    */
-  function compare(record) {
-    createMessage.warn('下个版本支持...')
+  function compareOrder(record) {
+    compare(record.id).then(() => {
+      createMessage.info('对账单比对完成')
+      queryPage()
+    })
   }
 
   /**
diff --git a/src/views/payment/order/refund/RefundOrderList.vue b/src/views/payment/order/refund/RefundOrderList.vue
index 5fb3d95b..76d71719 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 26f45a17..acdb4a65 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>
-- 
Gitee


From e3061291e78e815c68a46c4809ed08d1fb8331e1 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 3 Mar 2024 23:20:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat=20=E5=AF=B9=E8=B4=A6=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reconcile/detail/ReconcileDetail.api.ts   | 43 +++++++++++++++++++
 .../{ => detail}/ReconcileDetailInfo.vue      |  4 +-
 .../{ => detail}/ReconcileDetailList.vue      |  4 +-
 .../order/reconcile/diff/ReconcileDiff.api.ts | 43 +++++++++++++++++++
 .../{ => order}/ReconcileOrder.api.ts         | 42 +-----------------
 .../{ => order}/ReconcileOrderCreate.vue      |  0
 .../{ => order}/ReconcileOrderInfo.vue        |  0
 .../{ => order}/ReconcileOrderList.vue        |  0
 8 files changed, 91 insertions(+), 45 deletions(-)
 create mode 100644 src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts
 rename src/views/payment/order/reconcile/{ => detail}/ReconcileDetailInfo.vue (95%)
 rename src/views/payment/order/reconcile/{ => detail}/ReconcileDetailList.vue (98%)
 create mode 100644 src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
 rename src/views/payment/order/reconcile/{ => order}/ReconcileOrder.api.ts (62%)
 rename src/views/payment/order/reconcile/{ => order}/ReconcileOrderCreate.vue (100%)
 rename src/views/payment/order/reconcile/{ => order}/ReconcileOrderInfo.vue (100%)
 rename src/views/payment/order/reconcile/{ => order}/ReconcileOrderList.vue (100%)

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 00000000..65b013c3
--- /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 95%
rename from src/views/payment/order/reconcile/ReconcileDetailInfo.vue
rename to src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
index 709fb72d..b1dbdf42 100644
--- a/src/views/payment/order/reconcile/ReconcileDetailInfo.vue
+++ b/src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
@@ -44,7 +44,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 +70,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 98%
rename from src/views/payment/order/reconcile/ReconcileDetailList.vue
rename to src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
index 24eed735..d25f0ce9 100644
--- a/src/views/payment/order/reconcile/ReconcileDetailList.vue
+++ b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
@@ -38,7 +38,7 @@
 <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'
@@ -102,7 +102,7 @@
    */
   function queryPage() {
     loading.value = true
-    pageDetail({
+    page({
       ...model.queryParam,
       ...pages,
       recordOrderId: reconcileDetail?.id,
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 00000000..fa7e0385
--- /dev/null
+++ b/src/views/payment/order/reconcile/diff/ReconcileDiff.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/diff/page',
+    params,
+  })
+}
+
+/**
+ * 对账差异详情
+ */
+export function get(id: string) {
+  return defHttp.get<Result<ReconcileDetail>>({
+    url: '/order/reconcile/diff/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/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 e1da60ca..436a8a09 100644
--- a/src/views/payment/order/reconcile/ReconcileOrder.api.ts
+++ b/src/views/payment/order/reconcile/order/ReconcileOrder.api.ts
@@ -32,26 +32,6 @@ 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',
-    params: { id },
-  })
-}
-
 /**
  * 下载对账单
  */
@@ -63,7 +43,7 @@ export function downAndSave(id: any) {
 }
 
 /**
- * 下载对账单
+ * 对账单比对
  */
 export function compare(id: any) {
   return defHttp.post<any>({
@@ -89,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 100%
rename from src/views/payment/order/reconcile/ReconcileOrderList.vue
rename to src/views/payment/order/reconcile/order/ReconcileOrderList.vue
-- 
Gitee


From 052af82748142756dbd017f1b200f48a28284185 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Mon, 4 Mar 2024 23:03:53 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat=20=E5=AF=B9=E8=B4=A6=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reconcile/detail/ReconcileDetailInfo.vue  |   9 +-
 .../reconcile/detail/ReconcileDetailList.vue  |   8 +-
 .../order/reconcile/diff/ReconcileDiff.api.ts |  20 ++-
 .../reconcile/diff/ReconcileDiffInfo.vue      |  95 +++++++++++++
 .../reconcile/diff/ReconcileDiffList.vue      | 119 ++++++++++++++++
 .../reconcile/diff/ReconcileDiffListModel.vue | 127 ++++++++++++++++++
 .../reconcile/order/ReconcileOrderList.vue    |  64 +++++++--
 7 files changed, 416 insertions(+), 26 deletions(-)
 create mode 100644 src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue
 create mode 100644 src/views/payment/order/reconcile/diff/ReconcileDiffList.vue
 create mode 100644 src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue

diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue b/src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
index b1dbdf42..ba63d63d 100644
--- a/src/views/payment/order/reconcile/detail/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 }}
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
index d25f0ce9..7608f36e 100644
--- a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
+++ b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
@@ -6,19 +6,18 @@
       <vxe-column type="seq" width="60" />
       <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 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>
@@ -48,6 +47,7 @@
   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)
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts b/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
index fa7e0385..8a01ebfd 100644
--- a/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
+++ b/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
@@ -6,7 +6,7 @@ import { BaseEntity } from '/#/web'
  * 对账差异分页
  */
 export function page(params) {
-  return defHttp.get<Result<PageResult<ReconcileDetail>>>({
+  return defHttp.get<Result<PageResult<ReconcileRecord>>>({
     url: '/order/reconcile/diff/page',
     params,
   })
@@ -16,7 +16,7 @@ export function page(params) {
  * 对账差异详情
  */
 export function get(id: string) {
-  return defHttp.get<Result<ReconcileDetail>>({
+  return defHttp.get<Result<ReconcileRecord>>({
     url: '/order/reconcile/diff/findById',
     params: { id },
   })
@@ -25,7 +25,7 @@ export function get(id: string) {
 /**
  * 通用支付对账记录
  */
-export interface ReconcileDetail extends BaseEntity {
+export interface ReconcileRecord extends BaseEntity {
   // 关联对账订单ID
   recordOrderId?: string
   // 交易类型
@@ -40,4 +40,18 @@ export interface ReconcileDetail extends BaseEntity {
   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 00000000..5380a024
--- /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 00000000..697c8781
--- /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 00000000..598ac5fe
--- /dev/null
+++ b/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
@@ -0,0 +1,127 @@
+<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="交易金额" />
+      <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" />
+  </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, model, loading } = useTablePage(queryPage)
+  const { notification, createMessage } = useMessage()
+  const { dictDropDown, dictConvert } = useDict()
+
+  let reconcileTradeList = $ref<LabeledValue[]>([])
+
+  // 查询条件
+  const fields = computed(() => {
+    return [{ field: 'title', 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() {
+    reconcileTradeList = await dictDropDown('PayReconcileTrade')
+  }
+  /**
+   * 入口
+   */
+  function init(record: ReconcileDetail) {
+    visible = true
+    reconcileDetail = record
+    queryPage()
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+      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/order/ReconcileOrderList.vue b/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
index a6d41a6d..f81cd6b7 100644
--- a/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
+++ b/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
@@ -40,11 +40,23 @@
           </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 { compare, 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()
+          })
       },
     })
   }
@@ -163,9 +183,20 @@
    * 对账明显比对
    */
   function compareOrder(record) {
-    compare(record.id).then(() => {
-      createMessage.info('对账单比对完成')
-      queryPage()
+    createConfirm({
+      iconType: 'info',
+      title: '提示',
+      content: '确定要进行比对吗？',
+      onOk: () => {
+        createMessage.info('对账单比对中.....')
+        compare(record.id)
+          .then(() => {
+            createMessage.info('对账单比对完成')
+          })
+          .finally(() => {
+            queryPage()
+          })
+      },
     })
   }
 
@@ -182,6 +213,13 @@
   function showDetailPage(record) {
     reconcileDetailList.init(record)
   }
+
+  /**
+   * 查看差异单
+   */
+  function showDiffPage(record) {
+    reconcileDiffListModel.init(record)
+  }
 </script>
 
 <style scoped lang="less"></style>
-- 
Gitee


From 97466ee5e7e906a03d78f76ebbce9a829eff1f7f Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Tue, 5 Mar 2024 16:51:39 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat=20=E5=AF=B9=E8=B4=A6=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=92=8C=E5=B7=AE=E5=BC=82=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reconcile/detail/ReconcileDetailList.vue  | 28 +++++++++++++------
 .../reconcile/diff/ReconcileDiffListModel.vue | 24 ++++++++++++----
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
index 7608f36e..85672049 100644
--- a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
+++ b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
@@ -2,9 +2,16 @@
   <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="orderId" title="本地订单ID" />
       <vxe-column field="gatewayOrderNo" title="网关订单号" />
@@ -13,7 +20,7 @@
           <a-tag>{{ dictConvert('ReconcileTrade', row.type) }}</a-tag>
         </template>
       </vxe-column>
-      <vxe-column field="createTime" title="创建时间" />
+      <vxe-column field="createTime" title="创建时间" sortable />
       <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
         <template #default="{ row }">
           <span>
@@ -40,7 +47,7 @@
   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'
@@ -50,7 +57,8 @@
   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()
   }
 
@@ -105,6 +114,7 @@
     page({
       ...model.queryParam,
       ...pages,
+      ...sortParam,
       recordOrderId: reconcileDetail?.id,
     }).then(({ data }) => {
       pageQueryResHandel(data)
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue b/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
index 598ac5fe..52581979 100644
--- a/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
+++ b/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
@@ -24,8 +24,8 @@
       </vxe-column>
       <vxe-column field="orderId" title="本地订单" />
       <vxe-column field="gatewayOrderNo" title="网关订单" />
-      <vxe-column field="amount" title="交易金额" />
-      <vxe-column field="orderTime" 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>
@@ -60,15 +60,23 @@
   import { ReconcileDetail } from '/@/views/payment/order/reconcile/detail/ReconcileDetail.api'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, pagination, pages, model, loading } = useTablePage(queryPage)
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, pagination, pages, sortParam, model, loading } =
+    useTablePage(queryPage)
   const { notification, createMessage } = useMessage()
   const { dictDropDown, dictConvert } = useDict()
 
-  let reconcileTradeList = $ref<LabeledValue[]>([])
+  let orderTypeList = $ref<LabeledValue[]>([])
+  let diffTypeList = $ref<LabeledValue[]>([])
 
   // 查询条件
   const fields = computed(() => {
-    return [{ field: 'title', type: STRING, name: '订单名称', placeholder: '请输入订单名称' }] as QueryField[]
+    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>()
@@ -89,7 +97,8 @@
    * 初始化基础数据
    */
   async function initData() {
-    reconcileTradeList = await dictDropDown('PayReconcileTrade')
+    orderTypeList = await dictDropDown('ReconcileTrade')
+    diffTypeList = await dictDropDown('ReconcileDiffType')
   }
   /**
    * 入口
@@ -97,6 +106,8 @@
   function init(record: ReconcileDetail) {
     visible = true
     reconcileDetail = record
+    model.queryParam = {}
+    xTable?.clearSort()
     queryPage()
   }
 
@@ -108,6 +119,7 @@
     page({
       ...model.queryParam,
       ...pages,
+      ...sortParam,
       recordId: reconcileDetail?.id,
     }).then(({ data }) => {
       pageQueryResHandel(data)
-- 
Gitee


From f2df62584dd61ed5defa89a5e551f5a72abe5a06 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Tue, 5 Mar 2024 18:30:09 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix=20=E8=AE=A2=E5=8D=95=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/order/reconcile/detail/ReconcileDetailList.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
index 85672049..4351a19f 100644
--- a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
+++ b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
@@ -20,7 +20,7 @@
           <a-tag>{{ dictConvert('ReconcileTrade', row.type) }}</a-tag>
         </template>
       </vxe-column>
-      <vxe-column field="createTime" title="创建时间" sortable />
+      <vxe-column field="orderTime" title="订单时间" sortable />
       <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
         <template #default="{ row }">
           <span>
-- 
Gitee