diff --git a/src/views/payment/allocation/order/AllocationOrder.api.ts b/src/views/payment/allocation/order/AllocationOrder.api.ts index 176e443cf..2bde63e90 100644 --- a/src/views/payment/allocation/order/AllocationOrder.api.ts +++ b/src/views/payment/allocation/order/AllocationOrder.api.ts @@ -98,7 +98,7 @@ export interface AllocationOrder extends BaseEntity { title?: string // 网关支付订单号 gatewayPayOrderNo?: string - // 外部分账号 + // 通道分账号 outAllocationNo?: string // 分账单号 allocationNo?: string diff --git a/src/views/payment/order/pay/PayOrder.api.ts b/src/views/payment/order/pay/PayOrder.api.ts index 23c83a3b5..77a088de5 100644 --- a/src/views/payment/order/pay/PayOrder.api.ts +++ b/src/views/payment/order/pay/PayOrder.api.ts @@ -62,6 +62,16 @@ export function allocationById(id) { }) } +/** + * 获取汇总金额 + */ +export function getTotalAmount(param) { + return defHttp.get>({ + url: '/order/pay/getTotalAmount', + params: param, + }) +} + /** * 支付记录 */ diff --git a/src/views/payment/order/pay/PayOrderList.vue b/src/views/payment/order/pay/PayOrderList.vue index 850766672..edce4e2ce 100644 --- a/src/views/payment/order/pay/PayOrderList.vue +++ b/src/views/payment/order/pay/PayOrderList.vue @@ -6,7 +6,7 @@
import { computed, onMounted } from 'vue' import { $ref } from 'vue/macros' - import { allocationById, close, page, syncByOrderNo } from './PayOrder.api' + import { allocationById, close, getTotalAmount, page, syncByOrderNo } from './PayOrder.api' import useTablePage from '/@/hooks/bootx/useTablePage' import PayOrderInfo from './PayOrderInfo.vue' import RefundModel from './RefundModel.vue' @@ -122,7 +122,7 @@ return [ { field: 'orderNo', type: STRING, name: '订单号', placeholder: '请输入支付订单号' }, { field: 'bizOrderNo', type: STRING, name: '商户订单号', placeholder: '请输入商户订单号' }, - { field: 'outOrderNo', type: STRING, name: '外部订单号', placeholder: '请输入外部三方支付系统中的订单号' }, + { field: 'outOrderNo', type: STRING, name: '通道订单号', placeholder: '请输入外部三方支付系统中的订单号' }, { field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' }, { field: 'allocation', @@ -144,6 +144,7 @@ const xToolbar = $ref() const payOrderInfo = $ref() const refundModel = $ref() + let totalAmount = $ref(0.0) onMounted(() => { initData() @@ -167,6 +168,7 @@ */ function queryPage() { loading.value = true + // 查询列表 page({ ...model.queryParam, ...pages, @@ -174,6 +176,13 @@ }).then(({ data }) => { pageQueryResHandel(data) }) + // 汇总数据 + getTotalAmount({ + ...model.queryParam, + }).then(({ data }) => { + totalAmount = data + }) + return Promise.resolve() } /** diff --git a/src/views/payment/order/refund/RefundOrder.api.ts b/src/views/payment/order/refund/RefundOrder.api.ts index 5012b6b37..2474ba170 100644 --- a/src/views/payment/order/refund/RefundOrder.api.ts +++ b/src/views/payment/order/refund/RefundOrder.api.ts @@ -21,6 +21,7 @@ export function get(id) { params: { id }, }) } + /** * 获取单条 */ @@ -71,6 +72,16 @@ export function resetRefund(id) { }) } +/** + * 获取汇总金额 + */ +export function getTotalAmount(param) { + return defHttp.get>({ + url: '/order/refund/getTotalAmount', + params: param, + }) +} + /** * 退款记录 */ @@ -87,7 +98,7 @@ export interface RefundOrder extends BaseEntity { refundNo?: string // 商户退款号 bizRefundNo?: string - // 外部退款号 + // 通道退款号 outRefundNo?: string // 订单金额 orderAmount?: number diff --git a/src/views/payment/order/refund/RefundOrderList.vue b/src/views/payment/order/refund/RefundOrderList.vue index 98f48b287..feed43d39 100644 --- a/src/views/payment/order/refund/RefundOrderList.vue +++ b/src/views/payment/order/refund/RefundOrderList.vue @@ -14,7 +14,7 @@
import { computed, onMounted } from 'vue' import { $ref } from 'vue/macros' - import { page, resetRefund, syncByRefundNo } from './RefundOrder.api' + import { getTotalAmount, page, resetRefund, syncByRefundNo } from './RefundOrder.api' import useTablePage from '/@/hooks/bootx/useTablePage' import RefundOrderInfo from './RefundOrderInfo.vue' - import { VxeTable, VxeTableInstance, VxeToolbar, VxeToolbarInstance } from "vxe-table"; + import { VxeTable, VxeTableInstance, VxeToolbar, VxeToolbarInstance } from 'vxe-table' import BQuery from '/@/components/Bootx/Query/BQuery.vue' import { useMessage } from '/@/hooks/web/useMessage' import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query' @@ -99,16 +99,17 @@ let channelList = $ref([]) let refundStatusList = $ref([]) + let totalAmount = $ref(0.0) // 查询条件 const fields = computed(() => { return [ { field: 'bizRefundNo', type: STRING, name: '商户退款号', placeholder: '请输入商户退款号' }, { field: 'refundNo', type: STRING, name: '退款号', placeholder: '请输入退款号' }, - { field: 'outRefundNo', type: STRING, name: '外部退款号', placeholder: '请输入外部退款号' }, + { field: 'outRefundNo', type: STRING, name: '通道退款号', placeholder: '请输入通道退款号' }, { field: 'bizOrderNo', type: STRING, name: '商户订单号', placeholder: '请输入商户支付订单号' }, { field: 'orderNo', type: STRING, name: '订单号', placeholder: '请输入支付订单号' }, - { field: 'outOrderNo', type: STRING, name: '外部订单号', placeholder: '请输入三方支付的外部订单号' }, + { field: 'outOrderNo', type: STRING, name: '通道订单号', placeholder: '请输入三方支付的通道订单号' }, { field: 'title', type: STRING, name: '原支付标题', placeholder: '请输入原支付标题' }, { field: 'errorCode', name: '错误码', type: STRING }, { @@ -156,6 +157,12 @@ }).then(({ data }) => { pageQueryResHandel(data) }) + // 汇总数据 + getTotalAmount({ + ...model.queryParam, + }).then(({ data }) => { + totalAmount = data + }) return Promise.resolve() } diff --git a/src/views/payment/reconcile/detail/ReconcileDetail.api.ts b/src/views/payment/reconcile/detail/ReconcileDetail.api.ts index 7f16e7f50..fb82aa21a 100644 --- a/src/views/payment/reconcile/detail/ReconcileDetail.api.ts +++ b/src/views/payment/reconcile/detail/ReconcileDetail.api.ts @@ -34,7 +34,7 @@ export interface ReconcileDetail extends BaseEntity { paymentId?: string // 订单id refundId?: string - // 外部订单号 + // 通道订单号 gatewayOrderNo?: string // 交易金额 amount?: string diff --git a/src/views/payment/reconcile/detail/ReconcileDetailInfo.vue b/src/views/payment/reconcile/detail/ReconcileDetailInfo.vue index 863d5f5a6..a9b173ecf 100644 --- a/src/views/payment/reconcile/detail/ReconcileDetailInfo.vue +++ b/src/views/payment/reconcile/detail/ReconcileDetailInfo.vue @@ -18,7 +18,7 @@ {{ form.orderId }} - + {{ form.gatewayOrderNo }} diff --git a/src/views/payment/reconcile/detail/ReconcileDetailList.vue b/src/views/payment/reconcile/detail/ReconcileDetailList.vue index f4166af9d..2608b0ef7 100644 --- a/src/views/payment/reconcile/detail/ReconcileDetailList.vue +++ b/src/views/payment/reconcile/detail/ReconcileDetailList.vue @@ -16,7 +16,7 @@ - +