From 41748fb7f8c1bc44f67cb43b78648b75d1438b60 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Thu, 1 Feb 2024 22:17:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/order/pay/PayOrder.api.ts   |  2 +-
 src/views/payment/order/pay/PayOrderInfo.vue  |  2 +-
 src/views/payment/order/pay/PayOrderList.vue  |  6 ++---
 .../payment/order/refund/RefundOrderInfo.vue  |  2 +-
 .../payment/order/refund/RefundOrderList.vue  |  7 +++---
 .../record/callback/PayCallbackRecordList.vue |  3 ++-
 .../record/close/PayCloseRecord.api.ts        |  2 +-
 .../record/close/PayCloseRecordList.vue       |  2 +-
 .../record/repair/PayRepairRecord.api.ts      |  4 ++--
 .../record/repair/PayRepairRecordInfo.vue     |  4 ++--
 .../record/repair/PayRepairRecordList.vue     | 23 ++++++++++---------
 .../payment/record/sync/PaySyncRecordList.vue | 15 +++++++++---
 12 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/views/payment/order/pay/PayOrder.api.ts b/src/views/payment/order/pay/PayOrder.api.ts
index d1bb29777..4cc0eab17 100644
--- a/src/views/payment/order/pay/PayOrder.api.ts
+++ b/src/views/payment/order/pay/PayOrder.api.ts
@@ -87,7 +87,7 @@ export interface PayOrder extends BaseEntity {
   asyncChannel?: boolean
   // 是否是组合支付
   combinationPay?: boolean
-  // 关联网关支付号
+  // 关联网关支付ID
   gatewayOrderNo?: number
   // 金额
   amount?: number
diff --git a/src/views/payment/order/pay/PayOrderInfo.vue b/src/views/payment/order/pay/PayOrderInfo.vue
index ea50f86ff..fb4826b98 100644
--- a/src/views/payment/order/pay/PayOrderInfo.vue
+++ b/src/views/payment/order/pay/PayOrderInfo.vue
@@ -10,7 +10,7 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-descriptions title="" :column="{ md: 2, sm: 1, xs: 1 }">
-        <a-descriptions-item label="支付号">
+        <a-descriptions-item label="支付ID">
           {{ order.id }}
         </a-descriptions-item>
         <a-descriptions-item label="业务号">
diff --git a/src/views/payment/order/pay/PayOrderList.vue b/src/views/payment/order/pay/PayOrderList.vue
index c967c7777..6b85cf3d8 100644
--- a/src/views/payment/order/pay/PayOrderList.vue
+++ b/src/views/payment/order/pay/PayOrderList.vue
@@ -14,7 +14,7 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="id" title="支付号" sortable width="170" />
+        <vxe-column field="id" title="支付ID" sortable width="170" />
         <vxe-column field="businessNo" title="业务号" />
         <vxe-column field="title" title="标题" />
         <vxe-column field="amount" title="金额(分)" sortable />
@@ -110,9 +110,9 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'paymentId', type: STRING, name: '支付号', placeholder: '请输入完整支付号' },
-      { field: 'gatewayOrderNo', 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: '请输入标题' },
       { field: 'errorCode', name: '错误码', type: STRING },
       { field: 'asyncChannel', name: '异步支付方式', type: LIST, selectList: cayChannelList },
diff --git a/src/views/payment/order/refund/RefundOrderInfo.vue b/src/views/payment/order/refund/RefundOrderInfo.vue
index 96d0656c1..07607e6ca 100644
--- a/src/views/payment/order/refund/RefundOrderInfo.vue
+++ b/src/views/payment/order/refund/RefundOrderInfo.vue
@@ -15,7 +15,7 @@
       <a-descriptions-item label="退款号">
         {{ form.refundNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="原支付号">
+      <a-descriptions-item label="原支付ID">
         {{ form.paymentId }}
       </a-descriptions-item>
       <a-descriptions-item label="原业务号">
diff --git a/src/views/payment/order/refund/RefundOrderList.vue b/src/views/payment/order/refund/RefundOrderList.vue
index 87d0e70d2..a1779d42f 100644
--- a/src/views/payment/order/refund/RefundOrderList.vue
+++ b/src/views/payment/order/refund/RefundOrderList.vue
@@ -22,7 +22,8 @@
       >
         <vxe-column type="seq" title="序号" width="60" />
         <vxe-column field="id" title="退款ID" width="180" />
-        <vxe-column field="paymentId" title="原支付号" width="170">
+        <vxe-column field="title" title="原支付标题" />
+        <vxe-column field="paymentId" title="原支付ID" width="170">
           <template #default="{ row }">
             <a @click="showPayment(row.paymentId)">
               {{ row.paymentId }}
@@ -30,7 +31,6 @@
           </template>
         </vxe-column>
         <vxe-column field="businessNo" title="原业务号" :visible="false" />
-        <vxe-column field="title" title="原支付标题" />
         <vxe-column field="amount" title="退款金额" sortable />
         <vxe-column field="refundableBalance" title="剩余可退金额" sortable />
         <vxe-column field="async" title="包含异步通道">
@@ -100,7 +100,7 @@
   const fields = computed(() => {
     return [
       { field: 'id', type: STRING, name: '退款号', placeholder: '请输入完整退款号' },
-      { field: 'paymentId', type: STRING, name: '原支付单号', placeholder: '请输入完整支付号' },
+      { field: 'paymentId', type: STRING, name: '原支付单号', placeholder: '请输入完整支付ID' },
       { field: 'businessNo', type: STRING, name: '原业务号', placeholder: '请输入业务号' },
       { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
       { field: 'title', type: STRING, name: '原支付标题', placeholder: '请输入原支付标题' },
@@ -111,7 +111,6 @@
         placeholder: '请选择处理状态',
         selectList: payRefundStatusList,
       },
-      { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
     ] as QueryField[]
   })
 
diff --git a/src/views/payment/record/callback/PayCallbackRecordList.vue b/src/views/payment/record/callback/PayCallbackRecordList.vue
index 2657f8f9a..4cd329ad2 100644
--- a/src/views/payment/record/callback/PayCallbackRecordList.vue
+++ b/src/views/payment/record/callback/PayCallbackRecordList.vue
@@ -88,7 +88,8 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'paymentId', type: STRING, name: '支付号', placeholder: '请输入完整支付号' },
+      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入完整本地订单ID' },
+      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
       {
         field: 'payChannel',
         type: LIST,
diff --git a/src/views/payment/record/close/PayCloseRecord.api.ts b/src/views/payment/record/close/PayCloseRecord.api.ts
index b724fed29..1946be511 100644
--- a/src/views/payment/record/close/PayCloseRecord.api.ts
+++ b/src/views/payment/record/close/PayCloseRecord.api.ts
@@ -26,7 +26,7 @@ export function get(paymentId) {
  * 支付回调记录
  */
 export interface PayCloseRecord extends BaseEntity {
-  // 支付号
+  // 支付ID
   paymentId?: string
   // 业务号
   businessNo?: string
diff --git a/src/views/payment/record/close/PayCloseRecordList.vue b/src/views/payment/record/close/PayCloseRecordList.vue
index 595c66658..d1ba6c4bb 100644
--- a/src/views/payment/record/close/PayCloseRecordList.vue
+++ b/src/views/payment/record/close/PayCloseRecordList.vue
@@ -14,7 +14,7 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="paymentId" title="原支付号" width="170" sortable>
+        <vxe-column field="paymentId" title="原支付ID" width="170" sortable>
           <template #default="{ row }">
             <a @click="showPayment(row.paymentId)">
               {{ row.paymentId }}
diff --git a/src/views/payment/record/repair/PayRepairRecord.api.ts b/src/views/payment/record/repair/PayRepairRecord.api.ts
index 6583826a1..54485b47e 100644
--- a/src/views/payment/record/repair/PayRepairRecord.api.ts
+++ b/src/views/payment/record/repair/PayRepairRecord.api.ts
@@ -26,8 +26,8 @@ export function get(id) {
  * 支付回调记录
  */
 export interface PayRepairRecord extends BaseEntity {
-  // 支付回调记录id
-  repairId?: string
+  // 修复号
+  repairNo?: string
   // 本地订单ID
   orderId?: string
   // 本地业务号
diff --git a/src/views/payment/record/repair/PayRepairRecordInfo.vue b/src/views/payment/record/repair/PayRepairRecordInfo.vue
index 4087edc9a..ffab15590 100644
--- a/src/views/payment/record/repair/PayRepairRecordInfo.vue
+++ b/src/views/payment/record/repair/PayRepairRecordInfo.vue
@@ -13,8 +13,8 @@
         <a-descriptions-item label="主键ID">
           {{ form.id }}
         </a-descriptions-item>
-        <a-descriptions-item label="修复号">
-          {{ form.repairId }}
+        <a-descriptions-item label="修复单号">
+          {{ form.repairNo }}
         </a-descriptions-item>
         <a-descriptions-item label="本地订单ID">
           {{ form.orderId }}
diff --git a/src/views/payment/record/repair/PayRepairRecordList.vue b/src/views/payment/record/repair/PayRepairRecordList.vue
index e20d166e8..045d97288 100644
--- a/src/views/payment/record/repair/PayRepairRecordList.vue
+++ b/src/views/payment/record/repair/PayRepairRecordList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
+      <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 }" />
@@ -14,25 +14,25 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="repairId" title="修复号" width="170" />
-        <vxe-column field="orderId" title="被修复订单ID" width="170">
+        <vxe-column field="repairNo" title="修复单号" width="170" />
+        <vxe-column field="repairType" title="修复类型">
+          <template #default="{ row }">
+            <a-tag color="green">{{ dictConvert('PaymentType', row.repairType) }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="orderId" title="本地订单ID" width="170">
           <template #default="{ row }">
             <a @click="showOrder(row)">
               {{ row.orderId }}
             </a>
           </template>
         </vxe-column>
-        <vxe-column field="orderNo" title="本地业务号" />
+        <vxe-column field="orderNo" title="本地订单号" />
         <vxe-column field="repairSource" title="修复来源">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PayRepairSource', row.repairSource) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="repairType" title="修复类型">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('PaymentType', row.repairType) }}</a-tag>
-          </template>
-        </vxe-column>
         <vxe-column field="repairWay" title="修复方式">
           <template #default="{ row }">
             <a-tag v-if="row.repairType === 'pay'">{{ dictConvert('PayRepairWay', row.repairWay) }}</a-tag>
@@ -91,8 +91,9 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'paymentId', type: STRING, name: '支付单号', placeholder: '请输入支付单号' },
-      { field: 'businessNo', type: STRING, name: '业务号', placeholder: '请输入业务号' },
+      { field: 'repairNo', type: STRING, name: '修复单号', placeholder: '请输入修复号' },
+      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入本地订单ID' },
+      { field: 'orderNo', type: STRING, name: '本地订单号', placeholder: '请输入本地订单号' },
       {
         field: 'repairSource',
         type: LIST,
diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue
index ff93bbe3a..7269e438c 100644
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
+      <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 }" />
@@ -87,12 +87,20 @@
 
   let syncStatusList = $ref<LabeledValue[]>([])
   let payChannelList = $ref<LabeledValue[]>([])
+  let syncTypeList = $ref<LabeledValue[]>([])
 
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'paymentId', type: STRING, name: '支付单号', placeholder: '请输入支付单号' },
-      { field: 'businessNo', type: STRING, name: '业务号', placeholder: '请输入业务号' },
+      { field: 'orderId', type: STRING, name: '本地订单ID', placeholder: '请输入本地订单ID' },
+      { field: 'orderNo', type: STRING, name: '本地订单号', placeholder: '请输入本地订单号' },
+      {
+        field: 'syncType',
+        type: LIST,
+        name: '同步类型',
+        placeholder: '请选择同步类型',
+        selectList: syncTypeList,
+      },
       {
         field: 'gatewayStatus',
         type: LIST,
@@ -132,6 +140,7 @@
   async function init() {
     syncStatusList = await dictDropDown('PaySyncStatus')
     payChannelList = await dictDropDown('PayChannel')
+    syncTypeList = await dictDropDown('PaymentType')
   }
 
   /**