fix 网关订单号显示调整

2026-08-12 23:45:39 +08:00 · 2024-01-27 01:42:59 +08:00
parent 66927edd77
commit 5573191b4c
9 changed files with 27 additions and 21 deletions
--- a/src/views/payment/order/pay/PayChannelOrderInfo.vue
+++ b/src/views/payment/order/pay/PayChannelOrderInfo.vue
@@ -1,6 +1,6 @@
 <template>
  <basic-modal
-    title="退款订单"
+    title="通道支付订单详情"
    v-bind="$attrs"
    :loading="confirmLoading"
    :width="750"
@@ -9,10 +9,13 @@
    @cancel="handleCancel"
  >
    <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
+      <a-descriptions-item label="通道支付单ID">
+        <a-tag>{{ form.id }}</a-tag>
+      </a-descriptions-item>
      <a-descriptions-item label="支付通道">
        <a-tag>{{ dictConvert('PayChannel', form.channel) }}</a-tag>
      </a-descriptions-item>
-      <a-descriptions-item label="支付通道">
+      <a-descriptions-item label="异步支付">
        <a-tag v-if="form.async" color="green">是</a-tag>
        <a-tag v-else color="red">否</a-tag>
      </a-descriptions-item>
@@ -25,9 +28,6 @@
      <a-descriptions-item label="支付状态">
        <a-tag>{{ dictConvert('PayStatus', form.status) }}</a-tag>
      </a-descriptions-item>
-      <a-descriptions-item label="关联网关退款号">
-        {{ form.gatewayOrderNo }}
-      </a-descriptions-item>
    </a-descriptions>

    <template #footer>
@@ -64,10 +64,10 @@
  // 事件
  const emits = defineEmits(['ok'])
  // 入口
-  function init(id) {
+  function init(record) {
    visible.value = true
    confirmLoading.value = true
-    getChannel(id).then(({ data }) => {
+    getChannel(record.id).then(({ data }) => {
      form = data
      confirmLoading.value = false
    })
--- a/src/views/payment/order/pay/PayChannelOrderList.vue
+++ b/src/views/payment/order/pay/PayChannelOrderList.vue
@@ -1,9 +1,9 @@
 <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" ref="xTable" :data="records" :loading="loading">
      <vxe-column type="seq" width="60" />
-      <vxe-column field="id" title="通道支付单ID" width="170"/>
+      <vxe-column field="id" title="通道支付单ID" width="170" />
      <vxe-column field="channel" title="支付通道">
        <template #default="{ row }">
          <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
--- a/src/views/payment/order/pay/PayOrderList.vue
+++ b/src/views/payment/order/pay/PayOrderList.vue
@@ -111,6 +111,7 @@
  const fields = computed(() => {
    return [
      { field: 'paymentId', type: STRING, name: '支付号', placeholder: '请输入完整支付号' },
+      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
      { field: 'businessNo', type: STRING, name: '业务号', placeholder: '请输入业务号' },
      { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
      { field: 'errorCode', name: '错误码', type: STRING },
--- a/src/views/payment/order/pay/RefundModel.vue
+++ b/src/views/payment/order/pay/RefundModel.vue
@@ -78,8 +78,8 @@
      form.refundChannels = data.map((item) => {
        return {
          channel: item.channel,
-          amount: item.amount,
-          maxAmount: item.amount,
+          amount: item.refundableBalance,
+          maxAmount: item.refundableBalance,
        }
      })
      confirmLoading.value = false
--- a/src/views/payment/order/refund/RefundChannelOrderInfo.vue
+++ b/src/views/payment/order/refund/RefundChannelOrderInfo.vue
@@ -1,6 +1,6 @@
 <template>
  <basic-modal
-    title="退款订单"
+    title="通道退款订单详情"
    v-bind="$attrs"
    :loading="confirmLoading"
    :width="750"
@@ -57,10 +57,10 @@
  // 事件
  const emits = defineEmits(['ok'])
  // 入口
-  function init(id) {
+  function init(record) {
    visible.value = true
    confirmLoading.value = true
-    getDetail(id).then(({ data }) => {
+    getDetail(record.id).then(({ data }) => {
      form = data
      confirmLoading.value = false
    })
--- a/src/views/payment/order/refund/RefundChannelOrderList.vue
+++ b/src/views/payment/order/refund/RefundChannelOrderList.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" ref="xTable" :data="records" :loading="loading">
      <vxe-column type="seq" width="60" />
@@ -11,7 +11,6 @@
      <vxe-column field="orderAmount" title="订单金额" />
      <vxe-column field="amount" title="退款金额" />
      <vxe-column field="payChannelId" title="通道支付单ID" />
-      <vxe-column field="gatewayOrderNo" title="关联网关退款号" />
      <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
        <template #default="{ row }">
          <span>
--- a/src/views/payment/order/refund/RefundOrder.api.ts
+++ b/src/views/payment/order/refund/RefundOrder.api.ts
@@ -15,10 +15,10 @@ export function page(params) {
 /**
 * 获取单条
 */
-export function get(paymentId) {
+export function get(id) {
  return defHttp.get<Result<RefundOrder>>({
    url: '/order/refund/findById',
-    params: { paymentId },
+    params: { id },
  })
 }

@@ -62,6 +62,8 @@ export interface RefundOrder extends BaseEntity {
  businessNo?: string
  // 异步方式关联退款请求号
  refundNo?: string
+  // 网关订单号
+  gatewayOrderNo?: string
  // 标题
  title?: string
  // 金额
--- a/src/views/payment/order/refund/RefundOrderInfo.vue
+++ b/src/views/payment/order/refund/RefundOrderInfo.vue
@@ -15,6 +15,9 @@
      <a-descriptions-item label="原业务号">
        {{ form.businessNo }}
      </a-descriptions-item>
+      <a-descriptions-item label="网关订单号">
+        {{ form.gatewayOrderNo }}
+      </a-descriptions-item>
      <a-descriptions-item label="退款号">
        {{ form.refundNo }}
      </a-descriptions-item>
--- a/src/views/payment/order/refund/RefundOrderList.vue
+++ b/src/views/payment/order/refund/RefundOrderList.vue
@@ -26,6 +26,7 @@
        <vxe-column field="title" title="原支付标题" />
        <vxe-column field="amount" title="退款金额" sortable />
        <vxe-column field="refundableBalance" title="剩余可退金额" sortable />
+        <vxe-column field="gatewayOrderNo" title="网关订单号" />
        <vxe-column field="refundTime" title="退款时间" sortable />
        <vxe-column field="refundStatus" title="状态">
          <template #default="{ row }">
@@ -36,7 +37,7 @@
          <template #default="{ row }">
            <a-link @click="show(row)">查看</a-link>
            <a-divider type="vertical" />
-            <a-link @click="showChannel(row)">渠道订单</a-link>
+            <a-link @click="showChannel(row)">通道订单</a-link>
          </template>
        </vxe-column>
      </vxe-table>
@@ -85,7 +86,7 @@
      { field: 'id', type: STRING, name: '退款号', placeholder: '请输入完整退款号' },
      { field: 'paymentId', type: STRING, name: '原支付单号', placeholder: '请输入完整支付号' },
      { field: 'businessNo', type: STRING, name: '原业务号', placeholder: '请输入业务号' },
-      { field: 'refundRequestNo', type: STRING, name: '外部网关请求号', placeholder: '请输入完整外部网关请求号' },
+      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
      { field: 'title', type: STRING, name: '原支付标题', placeholder: '请输入原支付标题' },
      {
        field: 'status',
@@ -114,7 +115,7 @@
  }

  /**
-   * 初始化数据`````````````````````````````````````````````````````````````````````````````````````````````````````
+   * 初始化数据
   */
  async function initData() {
    payRefundStatusList = await dictDropDown('PayRefundStatus')