feat 流水表字段调整, 对账功能联调

2025-09-02 02:24:29 +00:00 · 2024-02-28 17:02:01 +08:00
parent 73183f0509
commit 28456e9fbd
11 changed files with 38 additions and 15 deletions
--- a/src/settings/siteSetting.ts
+++ b/src/settings/siteSetting.ts
@@ -1,11 +1,11 @@
 // github repo url
-export const GITHUB_URL = 'https://github.com/xxm1995/bootx-platform'
+export const GITHUB_URL = 'https://github.com/dromara/dax-pay'

 // gitee repo url
-export const GITEE_URL = 'https://gitee.com/bootx/bootx-platform'
+export const GITEE_URL = 'https://gitee.com/dromara/dax-pay'

 // 文档地址
-export const DOC_URL = 'https://gitee.com/bootx/bootx-platform'
+export const DOC_URL = 'https://bootx.gitee.io/'

 // 预览地址
-export const SITE_URL = 'http://v3.platform.bootx.cn/'
+export const SITE_URL = 'https://daxpay.demo.bootx.cn/'
--- a/src/views/payment/channel/alipay/record/AlipayRecord.api.ts
+++ b/src/views/payment/channel/alipay/record/AlipayRecord.api.ts
@@ -38,4 +38,6 @@ export interface AlipayRecord extends BaseEntity {
  gatewayOrderNo?: string
  // 终端ip
  ip?: string
+  // 网关时间
+  gatewayTime?: string
 }
--- a/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
+++ b/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
@@ -25,6 +25,9 @@
        <a-descriptions-item label="业务类型">
          <a-tag>{{ dictConvert('AlipayRecordType', alipayRecord.type) }}</a-tag>
        </a-descriptions-item>
+        <a-descriptions-item label="网关时间">
+          {{ alipayRecord.gatewayTime }}
+        </a-descriptions-item>
        <a-descriptions-item label="记录时间">
          {{ alipayRecord.createTime }}
        </a-descriptions-item>
--- a/src/views/payment/channel/alipay/record/AlipayRecordList.vue
+++ b/src/views/payment/channel/alipay/record/AlipayRecordList.vue
@@ -23,7 +23,7 @@
        <vxe-column field="amount" title="金额" />
        <vxe-column field="orderId" title="本地订单ID" width="170" />
        <vxe-column field="gatewayOrderNo" title="网关订单号" width="170" />
-        <vxe-column field="createTime" title="记录时间" sortable />
+        <vxe-column field="gatewayTime" title="网关时间" sortable />
        <vxe-column fixed="right" width="50" :showOverflow="false" title="操作">
          <template #default="{ row }">
            <a-link @click="show(row)">查看</a-link>
--- a/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts
+++ b/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts
@@ -38,4 +38,6 @@ export interface WechatPayRecord extends BaseEntity {
  gatewayOrderNo?: string
  // 终端ip
  ip?: string
+  // 网关时间
+  gatewayTime?: string
 }
--- a/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
+++ b/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
@@ -25,6 +25,9 @@
        <a-descriptions-item label="业务类型">
          <a-tag>{{ dictConvert('WechatPayRecordType', wechatPayRecord.type) }}</a-tag>
        </a-descriptions-item>
+        <a-descriptions-item label="网关时间">
+          {{ wechatPayRecord.gatewayTime }}
+        </a-descriptions-item>
        <a-descriptions-item label="记录时间">
          {{ wechatPayRecord.createTime }}
        </a-descriptions-item>
--- a/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
+++ b/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
@@ -23,7 +23,7 @@
        <vxe-column field="amount" title="金额" />
        <vxe-column field="orderId" title="本地订单ID" width="170" />
        <vxe-column field="gatewayOrderNo" title="网关订单号" width="170" />
-        <vxe-column field="createTime" title="记录时间" sortable />
+        <vxe-column field="gatewayTime" title="网关时间" sortable />
        <vxe-column fixed="right" width="50" :showOverflow="false" title="操作">
          <template #default="{ row }">
            <a-link @click="show(row)">查看</a-link>
--- a/src/views/payment/order/reconcile/ReconcileOrder.api.ts
+++ b/src/views/payment/order/reconcile/ReconcileOrder.api.ts
@@ -62,6 +62,16 @@ export function downAndSave(id: any) {
  })
 }

+/**
+ * 下载对账单
+ */
+export function compare(id: any) {
+  return defHttp.post<any>({
+    url: '/order/reconcile/compare',
+    params: { id },
+  })
+}
+
 /**
 * 支付对账订单
 */
--- a/src/views/payment/order/reconcile/ReconcileOrderList.vue
+++ b/src/views/payment/order/reconcile/ReconcileOrderList.vue
@@ -36,7 +36,7 @@
        <vxe-column field="compare" title="对账单比对">
          <template #default="{ row }">
            <a-tag v-if="row.compare" color="green">已比对</a-tag>
-            <a-link v-else :disabled="!row.down" color="red" @click="compare(row)">比对</a-link>
+            <a-link v-else :disabled="!row.down" color="red" @click="compareOrder(row)">比对</a-link>
          </template>
        </vxe-column>
        <vxe-column field="errorMsg" title="错误信息" />
@@ -71,7 +71,7 @@
  import { computed, onMounted } from 'vue'
  import { DATE, LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { downAndSave, page } from './ReconcileOrder.api'
+  import { compare, downAndSave, page } from "./ReconcileOrder.api";
  import ReconcileOrderInfo from './ReconcileOrderInfo.vue'
  import ReconcileDetailList from './ReconcileDetailList.vue'
  import ReconcileOrderCreate from '/@/views/payment/order/reconcile/ReconcileOrderCreate.vue'
@@ -162,8 +162,11 @@
  /**
   * 对账明显比对
   */
-  function compare(record) {
-    createMessage.warn('下个版本支持...')
+  function compareOrder(record) {
+    compare(record.id).then(() => {
+      createMessage.info('对账单比对完成')
+      queryPage()
+    })
  }

  /**
--- a/src/views/payment/order/refund/RefundOrderList.vue
+++ b/src/views/payment/order/refund/RefundOrderList.vue
@@ -99,8 +99,9 @@
  // 查询条件
  const fields = computed(() => {
    return [
-      { field: 'id', type: STRING, name: '退款号', placeholder: '请输入完整退款号' },
-      { field: 'paymentId', type: STRING, name: '原支付单号', placeholder: '请输入完整支付ID' },
+      { field: 'id', type: STRING, name: '退款ID', placeholder: '请输入完整退款ID' },
+      { field: 'refundNo', type: STRING, name: '退款号', placeholder: '请输入完整退款号' },
+      { field: 'paymentId', type: STRING, name: '原支付ID', placeholder: '请输入完整支付ID' },
      { field: 'businessNo', type: STRING, name: '原业务号', placeholder: '请输入业务号' },
      { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入完整网关订单号' },
      { field: 'title', type: STRING, name: '原支付标题', placeholder: '请输入原支付标题' },
--- a/src/views/sys/about/index.vue
+++ b/src/views/sys/about/index.vue
@@ -3,9 +3,8 @@
    <template #headerContent>
      <div class="flex justify-between items-center">
        <span class="flex-1">
-          <a :href="GITHUB_URL" target="_blank">Bootx-Platform </a>
-          是一个基于Spring Boot、Vue、Ant-Design-Vue
-          、TypeScript的后台管理脚手架，包含支付收单(支付宝、微信、聚合、组合支付)、工作流(Flowable)、三方对接(微信、钉钉、企微、短信)等功能。
+          <a :href="GITHUB_URL" target="_blank">dax-pay </a>
+          是一款免费开源的支付网关，独立部署通过HTTP方式进行调用，不与其他系统产生耦合关联，可以快速集成到各种系统中，提供可视化界面进行管理，便于实现统一的支付信息管理。
        </span>
      </div>
    </template>