diff --git a/src/views/payment/order/allocation/AllocationOrder.api.ts b/src/views/payment/allocation/order/AllocationOrder.api.ts
similarity index 100%
rename from src/views/payment/order/allocation/AllocationOrder.api.ts
rename to src/views/payment/allocation/order/AllocationOrder.api.ts
diff --git a/src/views/payment/order/allocation/AllocationOrderDetailInfo.vue b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
similarity index 100%
rename from src/views/payment/order/allocation/AllocationOrderDetailInfo.vue
rename to src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
diff --git a/src/views/payment/order/allocation/AllocationOrderDetailList.vue b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
similarity index 100%
rename from src/views/payment/order/allocation/AllocationOrderDetailList.vue
rename to src/views/payment/allocation/order/AllocationOrderDetailList.vue
diff --git a/src/views/payment/order/allocation/AllocationOrderInfo.vue b/src/views/payment/allocation/order/AllocationOrderInfo.vue
similarity index 100%
rename from src/views/payment/order/allocation/AllocationOrderInfo.vue
rename to src/views/payment/allocation/order/AllocationOrderInfo.vue
diff --git a/src/views/payment/order/allocation/AllocationOrderList.vue b/src/views/payment/allocation/order/AllocationOrderList.vue
similarity index 100%
rename from src/views/payment/order/allocation/AllocationOrderList.vue
rename to src/views/payment/allocation/order/AllocationOrderList.vue
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffList.vue b/src/views/payment/order/reconcile/diff/ReconcileDiffList.vue
deleted file mode 100644
index 0adc8526a..000000000
--- a/src/views/payment/order/reconcile/diff/ReconcileDiffList.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ dictConvert('ReconcileTrade', row.orderType) }}
-
-
-
-
- {{ dictConvert('ReconcileDiffType', row.diffType) }}
-
-
-
-
-
- {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }}
-
-
- {{ row.outAmount ? (row.outAmount / 100).toFixed(2) : 0 }}
-
-
-
-
- 查看
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts b/src/views/payment/reconcile/detail/ReconcileDetail.api.ts
similarity index 100%
rename from src/views/payment/order/reconcile/detail/ReconcileDetail.api.ts
rename to src/views/payment/reconcile/detail/ReconcileDetail.api.ts
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue b/src/views/payment/reconcile/detail/ReconcileDetailInfo.vue
similarity index 100%
rename from src/views/payment/order/reconcile/detail/ReconcileDetailInfo.vue
rename to src/views/payment/reconcile/detail/ReconcileDetailInfo.vue
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue b/src/views/payment/reconcile/detail/ReconcileDetailList.vue
similarity index 100%
rename from src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
rename to src/views/payment/reconcile/detail/ReconcileDetailList.vue
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts b/src/views/payment/reconcile/diff/ReconcileDiff.api.ts
similarity index 57%
rename from src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
rename to src/views/payment/reconcile/diff/ReconcileDiff.api.ts
index 0711436dc..cc0a848e3 100644
--- a/src/views/payment/order/reconcile/diff/ReconcileDiff.api.ts
+++ b/src/views/payment/reconcile/diff/ReconcileDiff.api.ts
@@ -6,7 +6,7 @@ import { BaseEntity } from '/#/web'
* 对账差异分页
*/
export function page(params) {
- return defHttp.get>>({
+ return defHttp.get>>({
url: '/order/reconcile/diff/page',
params,
})
@@ -16,7 +16,7 @@ export function page(params) {
* 对账差异详情
*/
export function get(id: string) {
- return defHttp.get>({
+ return defHttp.get>({
url: '/order/reconcile/diff/findById',
params: { id },
})
@@ -25,29 +25,37 @@ export function get(id: string) {
/**
* 通用支付对账记录
*/
-export interface ReconcileRecord extends BaseEntity {
- // 关联对账订单ID
- recordOrderId?: string
- // 交易类型
- type?: string
- // 订单id
- paymentId?: string
- // 订单id
- refundId?: string
- // 外部订单号
- gatewayOrderNo?: string
- // 交易金额
- amount?: string
+export interface ReconcileDiff extends BaseEntity {
// 商品名称
title?: string
+ // 关联对账订单ID
+ recordOrderId?: string
+ // 对账号
+ reconcileNo?: string
+ // 对账日期
+ reconcileDate?: string
+ // 交易类型
+ tradeType?: string
+ // 本地交易号
+ tradeNo?: string
+ // 外部交易号
+ outTradeNo?: string
+ // 交易时间
+ tradeTime?: string
+ // 交易金额
+ amount?: number
+ // 外部交易金额
+ outAmount?: number
+ // 差异类型
+ diffType?: string
// 差异内容
- diffs?: ReconcileDiff[]
+ diffs?: DiffInfo[]
}
/**
* 差异内容
*/
-export interface ReconcileDiff {
+export interface DiffInfo {
// 字段名
fieldName?: string
// 本地订单字段值
diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue b/src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
similarity index 70%
rename from src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue
rename to src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
index bb94cff63..a6a89e626 100644
--- a/src/views/payment/order/reconcile/diff/ReconcileDiffInfo.vue
+++ b/src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
@@ -12,30 +12,33 @@
{{ form.title }}
+
+ {{ form.reconcileNo }}
+
+
+ {{ form.reconcileDate }}
+
+
+ {{ form.tradeNo }}
+
+
+ {{ form.outTradeNo }}
+
+
+ {{ form.tradeTime }}
+
- {{ form.amount }}
+ {{ form.amount ? (form.amount / 100).toFixed(2) : '无' }}
-
- {{ form.recordId }}
+
+ {{ form.outAmount ? (form.outAmount / 100).toFixed(2) : '无' }}
-
- {{ form.detailId }}
-
-
- {{ form.orderId }}
-
-
- {{ form.gatewayOrderNo }}
-
-
- {{ dictConvert('ReconcileTrade', form.orderType) }}
+
+ {{ dictConvert('ReconcileTrade', form.tradeType) }}
{{ dictConvert('ReconcileDiffType', form.diffType) }}
-
- {{ form.orderTime }}
-
本地 : {{ item.localValue }}
远程 : {{ item.gatewayValue }}
@@ -55,12 +58,11 @@
import useFormEdit from '/@/hooks/bootx/useFormEdit'
import { BasicModal } from '/@/components/Modal'
import { useDict } from '/@/hooks/bootx/useDict'
- import { get } from './ReconcileDiff.api'
- import { ReconcileOrder } from '/@/views/payment/order/reconcile/order/ReconcileOrder.api'
+ import { get, ReconcileDiff } from './ReconcileDiff.api'
const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
const { dictConvert } = useDict()
// 表单
- let form = $ref({})
+ let form = $ref({})
// 事件
const emits = defineEmits(['ok'])
diff --git a/src/views/payment/reconcile/diff/ReconcileDiffList.vue b/src/views/payment/reconcile/diff/ReconcileDiffList.vue
new file mode 100644
index 000000000..e31492b1a
--- /dev/null
+++ b/src/views/payment/reconcile/diff/ReconcileDiffList.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dictConvert('PaymentType', row.tradeType) }}
+
+
+
+
+ {{ dictConvert('ReconcileDiffType', row.diffType) }}
+
+
+
+
+
+
+ {{ row.amount ? (row.amount / 100).toFixed(2) : '无' }}
+
+
+ {{ row.outAmount ? (row.outAmount / 100).toFixed(2) : '无' }}
+
+
+
+
+
+ {{ dictConvert('PayChannel', row.channel) }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrder.api.ts b/src/views/payment/reconcile/order/ReconcileOrder.api.ts
similarity index 100%
rename from src/views/payment/order/reconcile/order/ReconcileOrder.api.ts
rename to src/views/payment/reconcile/order/ReconcileOrder.api.ts
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrderCreate.vue b/src/views/payment/reconcile/order/ReconcileOrderCreate.vue
similarity index 100%
rename from src/views/payment/order/reconcile/order/ReconcileOrderCreate.vue
rename to src/views/payment/reconcile/order/ReconcileOrderCreate.vue
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue b/src/views/payment/reconcile/order/ReconcileOrderInfo.vue
similarity index 100%
rename from src/views/payment/order/reconcile/order/ReconcileOrderInfo.vue
rename to src/views/payment/reconcile/order/ReconcileOrderInfo.vue
diff --git a/src/views/payment/order/reconcile/order/ReconcileOrderList.vue b/src/views/payment/reconcile/order/ReconcileOrderList.vue
similarity index 97%
rename from src/views/payment/order/reconcile/order/ReconcileOrderList.vue
rename to src/views/payment/reconcile/order/ReconcileOrderList.vue
index a529a839e..bf4995bed 100644
--- a/src/views/payment/order/reconcile/order/ReconcileOrderList.vue
+++ b/src/views/payment/reconcile/order/ReconcileOrderList.vue
@@ -52,7 +52,7 @@
已比对
- 比对
+ 比对
@@ -99,7 +99,6 @@
-