fix 修复/回调和订单记录显示不正确问题修复

2025-09-02 02:24:29 +00:00 · 2024-02-09 22:56:43 +08:00
parent 94f700087d
commit b85b5cf07c
9 changed files with 33 additions and 24 deletions
--- a/src/views/payment/order/pay/PayChannelOrderInfo.vue
+++ b/src/views/payment/order/pay/PayChannelOrderInfo.vue
@@ -28,6 +28,9 @@
      <a-descriptions-item label="支付状态">
        <a-tag>{{ dictConvert('PayStatus', form.status) }}</a-tag>
      </a-descriptions-item>
+      <a-descriptions-item label="支付时间">
+        {{ form.payTime }}
+      </a-descriptions-item>
    </a-descriptions>

    <template #footer>
--- a/src/views/payment/order/pay/PayChannelOrderList.vue
+++ b/src/views/payment/order/pay/PayChannelOrderList.vue
@@ -27,6 +27,7 @@
          <a-tag>{{ dictConvert('PayStatus', row.status) }}</a-tag>
        </template>
      </vxe-column>
+      <vxe-column field="payTime" title="支付时间" />
      <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
        <template #default="{ row }">
          <span>
--- a/src/views/payment/order/pay/PayOrder.api.ts
+++ b/src/views/payment/order/pay/PayOrder.api.ts
@@ -145,6 +145,8 @@ export interface PayChannelOrder extends BaseEntity {
  refundableBalance?: number
  // 支付状态
  status?: string
-  // 扩展参数的json字符串
-  extraParamsJson?: string
+  // 支付状态
+  payTime?: string
+  // 附加支付参数
+  channelExtra?: string
 }
--- a/src/views/payment/order/refund/RefundChannelOrderInfo.vue
+++ b/src/views/payment/order/refund/RefundChannelOrderInfo.vue
@@ -28,7 +28,7 @@
        {{ form.gatewayOrderNo }}
      </a-descriptions-item>
      <a-descriptions-item label="状态">
-        <a-tag>{{ dictConvert('PayRefundStatus', form.status) }}</a-tag>
+        <a-tag>{{ dictConvert('RefundStatus', form.status) }}</a-tag>
      </a-descriptions-item>
    </a-descriptions>

--- a/src/views/payment/order/refund/RefundChannelOrderList.vue
+++ b/src/views/payment/order/refund/RefundChannelOrderList.vue
@@ -13,7 +13,7 @@
      <vxe-column field="refundableAmount" title="剩余可退余额" />
      <vxe-column field="refundStatus" title="状态">
        <template #default="{ row }">
-          <a-tag>{{ dictConvert('PayRefundStatus', row.status) }}</a-tag>
+          <a-tag>{{ dictConvert('RefundStatus', row.status) }}</a-tag>
        </template>
      </vxe-column>
      <vxe-column field="PayChannelId" title="通道支付单ID" />
--- a/src/views/payment/order/refund/RefundOrderInfo.vue
+++ b/src/views/payment/order/refund/RefundOrderInfo.vue
@@ -43,7 +43,7 @@
        {{ form.refundTime }}
      </a-descriptions-item>
      <a-descriptions-item label="退款状态">
-        <a-tag>{{ dictConvert('PayRefundStatus', form.status) }}</a-tag>
+        <a-tag>{{ dictConvert('RefundStatus', form.status) }}</a-tag>
      </a-descriptions-item>
      <a-descriptions-item label="退款终端ip">
        {{ form.clientIp }}
--- a/src/views/payment/order/refund/RefundOrderList.vue
+++ b/src/views/payment/order/refund/RefundOrderList.vue
@@ -42,7 +42,7 @@
        <vxe-column field="refundTime" title="退款时间" sortable />
        <vxe-column field="refundStatus" title="状态">
          <template #default="{ row }">
-            <a-tag>{{ dictConvert('PayRefundStatus', row.status) }}</a-tag>
+            <a-tag>{{ dictConvert('RefundStatus', row.status) }}</a-tag>
          </template>
        </vxe-column>
        <vxe-column field="errorMsg" title="提示信息" />
@@ -133,7 +133,7 @@
   * 初始化数据
   */
  async function initData() {
-    payRefundStatusList = await dictDropDown('PayRefundStatus')
+    payRefundStatusList = await dictDropDown('RefundStatus')
  }

  /**
--- a/src/views/payment/record/repair/PayRepairRecordInfo.vue
+++ b/src/views/payment/record/repair/PayRepairRecordInfo.vue
@@ -25,7 +25,7 @@
        <a-descriptions-item label="修复类型">
          <a-tag>{{ dictConvert('PaymentType', form.repairType) }}</a-tag>
        </a-descriptions-item>
-        <a-descriptions-item label="修复通道">
+        <a-descriptions-item v-if="form.repairType === 'pay'" label="修复通道">
          <a-tag>{{ dictConvert('AsyncPayChannel', form.asyncChannel) }}</a-tag>
        </a-descriptions-item>
        <a-descriptions-item label="修复来源">
@@ -36,10 +36,12 @@
          <a-tag v-else>{{ dictConvert('RefundRepairWay', form.repairWay) }}</a-tag>
        </a-descriptions-item>
        <a-descriptions-item label="修复前订单状态">
-          <a-tag>{{ dictConvert('PayStatus', form.beforeStatus) }}</a-tag>
+          <a-tag v-if="form.repairType === 'pay'">{{ dictConvert('PayStatus', form.beforeStatus) }}</a-tag>
+          <a-tag v-else>{{ dictConvert('RefundStatus', form.beforeStatus) }}</a-tag>
        </a-descriptions-item>
        <a-descriptions-item label="修复后订单状态">
-          <a-tag>{{ dictConvert('PayStatus', form.afterStatus) }}</a-tag>
+          <a-tag v-if="form.repairType === 'pay'">{{ dictConvert('PayStatus', form.afterStatus) }}</a-tag>
+          <a-tag v-else>{{ dictConvert('RefundStatus', form.afterStatus) }}</a-tag>
        </a-descriptions-item>
        <a-descriptions-item label="修复时间">
          {{ form.createTime }}
--- a/src/views/payment/record/repair/PayRepairRecordList.vue
+++ b/src/views/payment/record/repair/PayRepairRecordList.vue
@@ -14,10 +14,10 @@
        @sort-change="sortChange"
      >
        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="repairNo" title="修复单号" width="170" />
-        <vxe-column field="repairType" title="修复类型">
+        <vxe-column field="repairNo" title="修复单号" min-width="170" />
+        <vxe-column field="repairWay" title="修复方式">
          <template #default="{ row }">
-            <a-tag color="green">{{ dictConvert('PaymentType', row.repairType) }}</a-tag>
+            <a-tag color="green">{{ dictConvert('PayRepairWay', row.repairWay) }}</a-tag>
          </template>
        </vxe-column>
        <vxe-column field="orderId" title="本地订单ID" width="170">
@@ -27,18 +27,17 @@
            </a>
          </template>
        </vxe-column>
-        <vxe-column field="orderNo" title="本地订单号" />
+        <vxe-column field="repairType" title="订单类型">
+          <template #default="{ row }">
+            <a-tag>{{ dictConvert('PaymentType', row.repairType) + '订单' }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="orderNo" :visible="false" title="本地订单号" />
        <vxe-column field="repairSource" title="修复来源">
          <template #default="{ row }">
            <a-tag>{{ dictConvert('PayRepairSource', row.repairSource) }}</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>
-            <a-tag v-else>{{ dictConvert('RefundRepairWay', row.repairWay) }}</a-tag>
-          </template>
-        </vxe-column>
        <vxe-column field="createTime" title="修复时间" />
        <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
          <template #default="{ row }">
@@ -79,7 +78,8 @@
  import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.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()

@@ -104,8 +104,8 @@
      {
        field: 'repairType',
        type: LIST,
-        name: '修复类型',
-        placeholder: '请选择修复类型',
+        name: '订单类型',
+        placeholder: '请选择订单类型',
        selectList: repairTypeList,
      },
      {
@@ -147,7 +147,8 @@
    repairSourceList = await dictDropDown('PayRepairSource')
    repairTypeList = await dictDropDown('PaymentType')
    asyncChannelList = await dictDropDown('AsyncPayChannel')
-    repairWayList = (await dictDropDown('PayRepairWay')).concat(await dictDropDown('RefundRepairWay'))
+    // 退款修复方式是支付修复的子集
+    repairWayList = await dictDropDown('PayRepairWay')
  }

  /**