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 @@ - - - - - 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 }} -