diff --git a/src/settings/siteSetting.ts b/src/settings/siteSetting.ts
index ec0cd7989..0ae290dc5 100644
--- 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/'
diff --git a/src/views/payment/channel/alipay/record/AlipayRecord.api.ts b/src/views/payment/channel/alipay/record/AlipayRecord.api.ts
index b975a99d7..551dc6299 100644
--- 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
}
diff --git a/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue b/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
index 9eeb08d87..5ef9cac79 100644
--- a/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
+++ b/src/views/payment/channel/alipay/record/AlipayRecordInfo.vue
@@ -25,6 +25,9 @@
{{ dictConvert('AlipayRecordType', alipayRecord.type) }}
+
+ {{ alipayRecord.gatewayTime }}
+
{{ alipayRecord.createTime }}
diff --git a/src/views/payment/channel/alipay/record/AlipayRecordList.vue b/src/views/payment/channel/alipay/record/AlipayRecordList.vue
index 20e5d7c78..0a2626548 100644
--- a/src/views/payment/channel/alipay/record/AlipayRecordList.vue
+++ b/src/views/payment/channel/alipay/record/AlipayRecordList.vue
@@ -23,7 +23,7 @@
-
+
查看
diff --git a/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts b/src/views/payment/channel/wechat/record/WechatPayRecord.api.ts
index c88f51404..28cdaa2f0 100644
--- 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
}
diff --git a/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue b/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
index 667ceb812..16b3097ea 100644
--- a/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
+++ b/src/views/payment/channel/wechat/record/WechatPayRecordInfo.vue
@@ -25,6 +25,9 @@
{{ dictConvert('WechatPayRecordType', wechatPayRecord.type) }}
+
+ {{ wechatPayRecord.gatewayTime }}
+
{{ wechatPayRecord.createTime }}
diff --git a/src/views/payment/channel/wechat/record/WechatPayRecordList.vue b/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
index de9e37ba9..b97b843ab 100644
--- a/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
+++ b/src/views/payment/channel/wechat/record/WechatPayRecordList.vue
@@ -23,7 +23,7 @@
-
+
查看
diff --git a/src/views/payment/order/reconcile/ReconcileOrder.api.ts b/src/views/payment/order/reconcile/ReconcileOrder.api.ts
index 17492e5bd..e1da60ca5 100644
--- 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({
+ url: '/order/reconcile/compare',
+ params: { id },
+ })
+}
+
/**
* 支付对账订单
*/
diff --git a/src/views/payment/order/reconcile/ReconcileOrderList.vue b/src/views/payment/order/reconcile/ReconcileOrderList.vue
index 4b3c629b9..a6d41a6df 100644
--- a/src/views/payment/order/reconcile/ReconcileOrderList.vue
+++ b/src/views/payment/order/reconcile/ReconcileOrderList.vue
@@ -36,7 +36,7 @@
已比对
- 比对
+ 比对
@@ -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()
+ })
}
/**
diff --git a/src/views/payment/order/refund/RefundOrderList.vue b/src/views/payment/order/refund/RefundOrderList.vue
index 5fb3d95b0..76d717197 100644
--- 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: '请输入原支付标题' },
diff --git a/src/views/sys/about/index.vue b/src/views/sys/about/index.vue
index 26f45a172..acdb4a657 100644
--- a/src/views/sys/about/index.vue
+++ b/src/views/sys/about/index.vue
@@ -3,9 +3,8 @@
- Bootx-Platform
- 是一个基于Spring Boot、Vue、Ant-Design-Vue
- 、TypeScript的后台管理脚手架,包含支付收单(支付宝、微信、聚合、组合支付)、工作流(Flowable)、三方对接(微信、钉钉、企微、短信)等功能。
+ dax-pay
+ 是一款免费开源的支付网关,独立部署通过HTTP方式进行调用,不与其他系统产生耦合关联,可以快速集成到各种系统中,提供可视化界面进行管理,便于实现统一的支付信息管理。