From a38bcb3f4640f08e2eb53455c5262529bb153dac Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Wed, 1 May 2024 17:35:34 +0800
Subject: [PATCH] =?UTF-8?q?ref=20=E5=9B=9E=E8=B0=83=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=92=8C=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/system/api/PayApiConfig.api.ts       |  4 +---
 src/views/payment/system/api/PayApiConfigEdit.vue      |  3 ---
 src/views/payment/system/api/PayApiConfigList.vue      |  9 ---------
 .../payment/task/notice/ClientNoticeRecordList.vue     |  7 +++----
 src/views/payment/task/notice/ClientNoticeTask.api.ts  |  6 ++++--
 src/views/payment/task/notice/ClientNoticeTaskList.vue | 10 +++++-----
 6 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/views/payment/system/api/PayApiConfig.api.ts b/src/views/payment/system/api/PayApiConfig.api.ts
index 121aaa74a..4115e4ec4 100644
--- a/src/views/payment/system/api/PayApiConfig.api.ts
+++ b/src/views/payment/system/api/PayApiConfig.api.ts
@@ -55,8 +55,6 @@ export interface PayApiConfig extends BaseEntity {
   reqSign?: boolean
   // 响应参数是否签名
   resSign?: boolean
-  // 回调信息是否签名
-  noticeSign?: boolean
   // 是否记录请求的信息
-  record?: boolean
+  remark?: string
 }
diff --git a/src/views/payment/system/api/PayApiConfigEdit.vue b/src/views/payment/system/api/PayApiConfigEdit.vue
index bfb057593..cbb133f4a 100644
--- a/src/views/payment/system/api/PayApiConfigEdit.vue
+++ b/src/views/payment/system/api/PayApiConfigEdit.vue
@@ -30,9 +30,6 @@
         <a-form-item label="回调通知" v-if="form.noticeSupport" name="notice">
           <a-switch v-model:checked="form.notice" :disabled="showable" />
         </a-form-item>
-        <a-form-item label="回调签名" v-if="form.noticeSupport" name="noticeSign">
-          <a-switch v-model:checked="form.noticeSign" :disabled="showable" />
-        </a-form-item>
         <a-form-item label="默认回调地址" v-if="form.noticeSupport" name="noticeUrl">
           <a-input v-model:value="form.noticeUrl" :disabled="showable" placeholder="请输入回调地址" />
         </a-form-item>
diff --git a/src/views/payment/system/api/PayApiConfigList.vue b/src/views/payment/system/api/PayApiConfigList.vue
index 2c2f00914..7af97fd56 100644
--- a/src/views/payment/system/api/PayApiConfigList.vue
+++ b/src/views/payment/system/api/PayApiConfigList.vue
@@ -30,15 +30,6 @@
             </template>
           </template>
         </vxe-column>
-        <vxe-column field="noticeSign" title="回调签名">
-          <template #default="{ row }">
-            <template v-if="row.noticeSupport">
-              <a-tag v-if="row.noticeSign" color="green">启用</a-tag>
-              <a-tag v-else color="red">停用</a-tag>
-            </template>
-            <template v-else> </template>
-          </template>
-        </vxe-column>
         <vxe-column field="noticeUrl" title="默认回调地址">
           <template #default="{ row }">
             <template v-if="row.noticeSupport">
diff --git a/src/views/payment/task/notice/ClientNoticeRecordList.vue b/src/views/payment/task/notice/ClientNoticeRecordList.vue
index d0970a16b..9b82a6774 100644
--- a/src/views/payment/task/notice/ClientNoticeRecordList.vue
+++ b/src/views/payment/task/notice/ClientNoticeRecordList.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-drawer forceRender v-bind="$attrs" title="通道订单列表" width="60%" :visible="visible" @close="visible = false">
+  <basic-drawer forceRender v-bind="$attrs" title="通知明细列表" width="60%" :visible="visible" @close="visible = false">
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
     <vxe-table
       row-id="id"
@@ -60,10 +60,9 @@
   import ClientNoticeRecordInfo from './ClientNoticeRecordInfo.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, sortChange, resetQueryParams, pagination, pages, sortParam, model, loading } =
-    useTablePage(queryPage)
+  const { handleTableChange, pageQueryResHandel, sortChange, pagination, sortParam, loading } = useTablePage(queryPage)
   const { notification, createMessage } = useMessage()
-  const { dictDropDown, dictConvert } = useDict()
+  const { dictConvert } = useDict()
 
   let visible = $ref(false)
   let task = $ref<ClientNoticeTask>({})
diff --git a/src/views/payment/task/notice/ClientNoticeTask.api.ts b/src/views/payment/task/notice/ClientNoticeTask.api.ts
index e2d5de564..4f9d8261d 100644
--- a/src/views/payment/task/notice/ClientNoticeTask.api.ts
+++ b/src/views/payment/task/notice/ClientNoticeTask.api.ts
@@ -59,8 +59,10 @@ export function getRecord(id) {
  * 消息通知任务
  */
 export interface ClientNoticeTask extends BaseEntity {
-  // 本地订单ID
-  orderId?: number
+  // 本地交易ID
+  tradeId?: string
+  // 本地交易ID
+  tradeNo?: string
   // 消息类型
   noticeType?: string
   // 消息内容
diff --git a/src/views/payment/task/notice/ClientNoticeTaskList.vue b/src/views/payment/task/notice/ClientNoticeTaskList.vue
index e4ec347b6..52d96c6df 100644
--- a/src/views/payment/task/notice/ClientNoticeTaskList.vue
+++ b/src/views/payment/task/notice/ClientNoticeTaskList.vue
@@ -14,10 +14,10 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="orderId" title="本地订单ID" width="170">
+        <vxe-column field="orderId" title="本地交易号" width="170">
           <template #default="{ row }">
             <a-link @click="showOrder(row)">
-              {{ row.orderId }}
+              {{ row.orderNo }}
             </a-link>
           </template>
         </vxe-column>
@@ -149,7 +149,7 @@
     clientNoticeTaskInfo.init(record)
   }
   /**
-   * 查看记录
+   * 查看记录列表
    */
   function showRecord(record) {
     clientNoticeRecordList.init(record)
@@ -159,9 +159,9 @@
    */
   function showOrder(record: ClientNoticeTask) {
     if (record.noticeType === 'pay') {
-      payOrderInfo.init(record.orderId)
+      payOrderInfo.init(record.tradeNo)
     } else {
-      refundOrderInfo.init(record.orderId)
+      refundOrderInfo.init(record.tradeNo)
     }
   }
 </script>