ref 相关记录调整

src/views/payment/order/pay/PayOrder.api.ts

@@ -1,7 +1,6 @@
 import { defHttp } from '/@/utils/http/axios'
 import { PageResult, Result } from '/#/axios'
 import { BaseEntity } from '/#/web'
-import { PaySyncResult } from '/@/views/payment/record/sync/PaySyncRecord.api'
 
 /**
  * 分页
@@ -37,7 +36,7 @@ export function getOrderByOrderNo(orderNo: string) {
  * 根据订单号同步支付状态
  */
 export function syncByOrderNo(orderNo: string) {
-  return defHttp.post<Result<PaySyncResult>>({
+  return defHttp.post<Result>({
     url: '/order/pay/syncByOrderNo',
     params: { orderNo },
   })

src/views/payment/record/close/PayCloseRecord.api.ts

@@ -26,18 +26,18 @@ export function get(paymentId) {
  * 支付回调记录
  */
 export interface PayCloseRecord extends BaseEntity {
-  // 支付ID
-  paymentId?: string
-  // 业务号
-  businessNo?: string
-  // 关闭的异步支付通道
-  asyncChannel?: string
+  // 订单号
+  orderNo?: string
+  // 商户订单号
+  bizOrderNo?: string
+  // 关闭的支付通道
+  channel?: string
   // 是否关闭成功
   closed?: boolean
+  // 错误编码
+  errorCode?: string
   // 错误消息
   errorMsg?: string
   // 客户端IP
   clientIp?: string
-  // 请求链路ID
-  reqId?: string
 }

src/views/payment/record/close/PayCloseRecordInfo.vue

@@ -10,18 +10,21 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="支付记录id">
-          {{ form.paymentId }}
+        <a-descriptions-item label="订单号">
+          {{ form.orderNo }}
         </a-descriptions-item>
         <a-descriptions-item label="业务号">
-          {{ form.businessNo }}
+          {{ form.bizOrderNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="异步支付通道">
-          {{ dictConvert('PayChannel', form.asyncChannel) }}
+        <a-descriptions-item label="支付通道">
+          {{ dictConvert('PayChannel', form.channel) }}
         </a-descriptions-item>
         <a-descriptions-item label="是否关闭成功">
           {{ form.closed ? '是' : '否' }}
         </a-descriptions-item>
+        <a-descriptions-item label="错误编码" v-if="form.errorCode">
+          {{ form.errorMsg }}
+        </a-descriptions-item>
         <a-descriptions-item label="错误消息" v-if="form.errorMsg">
           {{ form.errorMsg }}
         </a-descriptions-item>
@@ -47,18 +50,11 @@
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
   const {
-    initFormEditType,
     handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
     modalWidth,
-    title,
     confirmLoading,
     visible,
-    editable,
     showable,
-    formEditType,
   } = useFormEdit()
   const { dictConvert } = useDict()
 

src/views/payment/record/close/PayCloseRecordList.vue

@@ -14,23 +14,23 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="paymentId" title="原支付ID" width="170" sortable>
+        <vxe-column field="orderNo" title="订单号" width="170" sortable>
           <template #default="{ row }">
-            <a @click="showPayment(row.paymentId)">
+            <a @click="showPayOder(row.orderNo)">
               {{ row.paymentId }}
             </a>
           </template>
         </vxe-column>
-        <vxe-column field="businessNo" title="业务号" />
+        <vxe-column field="bizOrderNo" title="商户订单号" />
         <vxe-column field="closed" title="关闭状态">
           <template #default="{ row }">
             <a-tag v-if="row.closed" color="green">成功</a-tag>
             <a-tag v-else color="red">失败</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="asyncChannel" title="异步支付通道">
+        <vxe-column field="channel" title="支付通道">
           <template #default="{ row }">
-            {{ dictConvert('AsyncPayChannel', row.asyncChannel) }}
+            {{ dictConvert('PayChannel', row.channel) }}
           </template>
         </vxe-column>
         <vxe-column field="errorMsg" title="错误消息" />
@@ -73,7 +73,8 @@
   import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } = useTablePage(queryPage)
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
+    useTablePage(queryPage)
   const { notification, createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
@@ -133,7 +134,7 @@
     page({
       ...model.queryParam,
       ...pages,
-      ...sortParam
+      ...sortParam,
     }).then(({ data }) => {
       pageQueryResHandel(data)
     })
@@ -148,10 +149,9 @@
 
   /**
    * 查看支付单信息
-   * @param paymentId
    */
-  function showPayment(paymentId) {
-    payOrderInfo.init(paymentId)
+  function showPayOder(orderNo) {
+    payOrderInfo.init(orderNo)
   }
 </script>
 

src/views/payment/record/repair/PayRepairRecord.api.ts

@@ -29,9 +29,9 @@ export interface PayRepairRecord extends BaseEntity {
   // 修复号
   repairNo?: string
   // 本地订单ID
-  orderId?: string
+  tradeId?: string
   // 本地业务号
-  orderNo?: string
+  tradeNo?: string
   // 类型  支付修复/退款修复
   repairType?: string
   // 修复来源
@@ -39,11 +39,9 @@ export interface PayRepairRecord extends BaseEntity {
   // 修复类型
   repairWay?: string
   // 修复的异步支付通道
-  asyncChannel?: string
+  channel?: string
   // 修复前状态
   beforeStatus?: string
   // 修复后状态
   afterStatus?: string
-  // 金额变动
-  amount?: string
 }

src/views/payment/record/repair/PayRepairRecordInfo.vue

@@ -10,23 +10,20 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="主键ID">
-          {{ form.id }}
-        </a-descriptions-item>
         <a-descriptions-item label="修复单号">
           {{ form.repairNo }}
         </a-descriptions-item>
         <a-descriptions-item label="本地订单ID">
-          {{ form.orderId }}
+          {{ form.tradeId }}
         </a-descriptions-item>
         <a-descriptions-item label="本地业务号">
-          {{ form.orderNo }}
+          {{ form.tradeNo }}
         </a-descriptions-item>
         <a-descriptions-item label="修复类型">
           <a-tag>{{ dictConvert('PaymentType', form.repairType) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item v-if="form.repairType === 'pay'" label="修复通道">
-          <a-tag>{{ dictConvert('AsyncPayChannel', form.asyncChannel) }}</a-tag>
+        <a-descriptions-item label="修复通道">
+          <a-tag>{{ dictConvert('PayChannel', form.channel) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复来源">
           <a-tag>{{ dictConvert('PayRepairSource', form.repairSource) }}</a-tag>
@@ -62,18 +59,11 @@
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
   const {
-    initFormEditType,
     handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
     modalWidth,
-    title,
     confirmLoading,
     visible,
-    editable,
     showable,
-    formEditType,
   } = useFormEdit()
   const { dictConvert } = useDict()
 

src/views/payment/record/sync/PaySyncRecord.api.ts

@@ -53,20 +53,3 @@ export interface SyncRecord extends BaseEntity {
   // 请求链路ID
   reqId?: string
 }
-/**
- * 支付同步结果
- */
-export interface PaySyncResult {
-  // 支付网关同步状态
-  gatewayStatus?: string
-  // 是否同步成功
-  success?: boolean
-  // 是否进行了修复
-  repair?: boolean
-  // 支付单同步前状态
-  beforeStatus?: string
-  // 支付单同步后状态
-  afterStatus?: string
-  // 支付单同步后状态
-  errorMsg?: string
-}