From 2e0ee31597bbba3a6ff7faf78f5307246b5930be Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Fri, 31 May 2024 17:42:10 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=88=86=E8=B4=A6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/order/AllocationOrderInfo.vue  | 34 +++++++++----------
 .../allocation/order/AllocationOrderList.vue  |  4 +--
 .../payment/record/sync/PaySyncRecordInfo.vue |  4 +--
 .../payment/record/sync/PaySyncRecordList.vue |  3 +-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/views/payment/allocation/order/AllocationOrderInfo.vue b/src/views/payment/allocation/order/AllocationOrderInfo.vue
index b84d79339..a7bdc6bde 100644
--- a/src/views/payment/allocation/order/AllocationOrderInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderInfo.vue
@@ -52,6 +52,15 @@
         <a-descriptions-item label="完成时间" :span="2">
           {{ order.finishTime }}
         </a-descriptions-item>
+        <a-descriptions-item label="商户扩展参数" :span="2">
+          {{ orderExtra.attach }}
+        </a-descriptions-item>
+        <a-descriptions-item label="终端IP" :span="2">
+          {{ orderExtra.clientIp || '空' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通知地址" :span="4">
+          {{ orderExtra.notifyUrl }}
+        </a-descriptions-item>
         <a-descriptions-item v-if="order.errorCode" label="错误编码" :span="2">
           {{ order.errorMsg }}
         </a-descriptions-item>
@@ -71,32 +80,23 @@
 <script lang="ts" setup>
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import {
-    get,
-    AllocationOrder,
-    getOrderByAllocNo,
-    AllocationOrderExtra
-  } from './AllocationOrder.api'
+  import { AllocationOrder, getOrderByAllocNo, AllocationOrderExtra } from './AllocationOrder.api'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
-  const {
-    handleCancel,
-    confirmLoading,
-    visible,
-    showable,
-  } = useFormEdit()
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
   const { dictConvert } = useDict()
 
   let order = $ref<AllocationOrder>({})
   let orderExtra = $ref<AllocationOrderExtra>({})
-  // 入口
-  async function init(record: AllocationOrder) {
+  /**
+   * 入口
+   */
+  async function init(allocationNo) {
     visible.value = true
-    order = record
     confirmLoading.value = true
-    await getOrderByAllocNo(record.allocationNo as string).then(({ data }) => {
+    await getOrderByAllocNo(allocationNo).then(({ data }) => {
       order = data.order
-      orderExtra = data.orderExtra
+      orderExtra = data.extra
     })
     confirmLoading.value = false
   }
diff --git a/src/views/payment/allocation/order/AllocationOrderList.vue b/src/views/payment/allocation/order/AllocationOrderList.vue
index ad73b933e..0a88b906d 100644
--- a/src/views/payment/allocation/order/AllocationOrderList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderList.vue
@@ -66,7 +66,7 @@
                   <a-menu-item>
                     <a-link @click="syncInfo(row)">同步</a-link>
                   </a-menu-item>
-                  <a-menu-item v-if="row.status === 'allocation_end'">
+                  <a-menu-item v-if="['allocation_end', 'finish_failed'].includes(row.status)">
                     <a-link @click="finishInfo(row)">完结</a-link>
                   </a-menu-item>
                 </a-menu>
@@ -154,7 +154,7 @@
    * 查看
    */
   function show(record) {
-    allocationOrderInfo.init(record, FormEditType.Show)
+    allocationOrderInfo.init(record.allocationNo, FormEditType.Show)
   }
 
   /**
diff --git a/src/views/payment/record/sync/PaySyncRecordInfo.vue b/src/views/payment/record/sync/PaySyncRecordInfo.vue
index f63c7c70d..687442bb6 100644
--- a/src/views/payment/record/sync/PaySyncRecordInfo.vue
+++ b/src/views/payment/record/sync/PaySyncRecordInfo.vue
@@ -26,8 +26,8 @@
           <a-tag> {{ dictConvert('AsyncPayChannel', form.channel) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="同步结果" :span="2">
-          <a-tag v-if="row.syncType === 'pay'">{{ dictConvert('PaySyncStatus', form.outTradeStatus) }}</a-tag>
-          <a-tag v-else-if="row.syncType === 'refund'">{{ dictConvert('RefundSyncStatus', form.outTradeStatus) }}</a-tag>
+          <a-tag v-if="form.syncType === 'pay'">{{ dictConvert('PaySyncStatus', form.outTradeStatus) }}</a-tag>
+          <a-tag v-else-if="form.syncType === 'refund'">{{ dictConvert('RefundSyncStatus', form.outTradeStatus) }}</a-tag>
           <a-tag v-else>无</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复单号" :span="2">
diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue
index 395213d19..83a4d4c3e 100644
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -38,7 +38,7 @@
             <a-tag v-else>无需修复</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="errorMsg" title="错误消息" :min-width="160"/>
+        <vxe-column field="errorMsg" title="错误消息" :min-width="160" />
         <vxe-column field="createTime" title="同步时间" :min-width="160" />
         <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
           <template #default="{ row }">
@@ -81,6 +81,7 @@
   import PayRepairRecordInfo from '/@/views/payment/record/repair/PayRepairRecordInfo.vue'
   import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.vue'
   import AllocationOrderInfo from '/@/views/payment/allocation/order/AllocationOrderInfo.vue'
+  import ALink from '/@/components/Link/Link.vue'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)