diff --git a/src/views/payment/allocation/group/AllocationGroupConfig.vue b/src/views/payment/allocation/group/AllocationGroupConfig.vue
index c3116b79b..7f90cb6e9 100644
--- a/src/views/payment/allocation/group/AllocationGroupConfig.vue
+++ b/src/views/payment/allocation/group/AllocationGroupConfig.vue
@@ -21,7 +21,7 @@
- {{ dictConvert('AllocationReceiverType', row.receiverType) }}
+ {{ dictConvert('AllocReceiverType', row.receiverType) }}
diff --git a/src/views/payment/allocation/group/AllocationGroupSelect.vue b/src/views/payment/allocation/group/AllocationGroupSelect.vue
index 50bb1744d..22c1f32d6 100644
--- a/src/views/payment/allocation/group/AllocationGroupSelect.vue
+++ b/src/views/payment/allocation/group/AllocationGroupSelect.vue
@@ -18,14 +18,14 @@
- {{ dictConvert('AllocationReceiverType', row.receiverType) }}
+ {{ dictConvert('AllocReceiverType', row.receiverType) }}
- {{ dictConvert('AllocationRelationType', row.relationType) }}
+ {{ dictConvert('AllocRelationType', row.relationType) }}
diff --git a/src/views/payment/allocation/order/AllocationOrder.api.ts b/src/views/payment/allocation/order/AllocationOrder.api.ts
index ed1f1f8b7..a8e2c78d3 100644
--- a/src/views/payment/allocation/order/AllocationOrder.api.ts
+++ b/src/views/payment/allocation/order/AllocationOrder.api.ts
@@ -86,6 +86,12 @@ export function sync(allocationNo){
* 分账订单
*/
export interface AllocationOrder extends BaseEntity {
+ // 分账单号
+ allocationNo?: string
+ // 商户分账单号
+ bizAllocationNo?: string
+ // 通道分账号
+ outAllocationNo?: string
// 支付订单ID
orderId?: string
// 支付订单号
@@ -94,18 +100,8 @@ export interface AllocationOrder extends BaseEntity {
bizOrderNo?: string
// 外部系统支付订单号
outOrderNo?: string
- // 支付订单号
+ // 支付订单标题
title?: string
- // 网关支付订单号
- gatewayPayOrderNo?: string
- // 通道分账号
- outAllocationNo?: string
- // 分账单号
- allocationNo?: string
- // 商户分账单号
- bizAllocationNo?: string
- // 外部请求号
- outReqNo?: string
// 所属通道
channel?: string
// 总分账金额
@@ -114,6 +110,8 @@ export interface AllocationOrder extends BaseEntity {
description?: string
// 状态
status?: string
+ // 处理结果
+ result?: string
// 错误码
errorCode?: string
// 错误原因
diff --git a/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
index 588ec750f..cc988ccf5 100644
--- a/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
@@ -3,7 +3,7 @@
title="查看分账单信息"
v-bind="$attrs"
:loading="confirmLoading"
- :width="800"
+ :width="1000"
:visible="visible"
:mask-closable="showable"
@cancel="handleCancel"
@@ -14,12 +14,12 @@
{{ order.receiverName }}
- {{ dictConvert('AllocationReceiverType', order.receiverType) }}
+ {{ dictConvert('AllocReceiverType', order.receiverType) }}
{{ order.rate / 100.0 }}%
{{ order.amount ? (order.amount / 100).toFixed(2) : 0 }}
- {{ dictConvert('AllocationDetailResult', order.result) }}
+ {{ dictConvert('AllocDetailResult', order.result) }}
{{ order.finishTime }}
diff --git a/src/views/payment/allocation/order/AllocationOrderDetailList.vue b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
index 543456a16..63895f4cf 100644
--- a/src/views/payment/allocation/order/AllocationOrderDetailList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
@@ -6,7 +6,7 @@
- {{ dictConvert('AllocationReceiverType', row.receiverType) }}
+ {{ dictConvert('AllocReceiverType', row.receiverType) }}
@@ -16,7 +16,7 @@
{{ row.amount / 100.0 }} 元
- {{ dictConvert('AllocationDetailResult', row.result) }}
+ {{ dictConvert('AllocDetailResult', row.result) }}
{{ row.errorMsg }}
diff --git a/src/views/payment/allocation/order/AllocationOrderInfo.vue b/src/views/payment/allocation/order/AllocationOrderInfo.vue
index 4f26c7aa7..60130959e 100644
--- a/src/views/payment/allocation/order/AllocationOrderInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderInfo.vue
@@ -9,45 +9,54 @@
@cancel="handleCancel"
>
-
-
+
+
{{ order.title }}
-
- {{ order.orderNo }}
-
-
- {{ order.paymentId }}
-
-
-
- {{ order.gatewayPayOrderNo }}
-
-
- {{ order.gatewayAllocationNo }}
-
-
- {{ order.allocationNo }}
-
- {{ dictConvert('PayChannel', order.channel) }}
-
-
- {{ dictConvert('AllocationOrderStatus', order.status) }}
+ {{ dictConvert('PayChannel', order.channel) }}
{{ order.amount ? (order.amount / 100).toFixed(2) : 0 }}
-
-
-
- {{ order.errorMsg }}
+
+ {{ dictConvert('AllocOrderStatus', order.status) }}
-
+
+ {{ dictConvert('AllocOrderResult', order.result) }}
+
+
+ {{ order.description }}
+
+
+ {{ order.allocationNo }}
+
+
+ {{ order.orderNo }}
+
+
+ {{ order.allocationNo }}
+
+
+ {{ order.bizOrderNo }}
+
+
+ {{ order.outAllocationNo || '无' }}
+
+
+ {{ order.outOrderNo }}
+
+
+ {{ order.createTime }}
+
+
{{ order.finishTime }}
-
- {{ order.createTime }}
+
+ {{ order.errorMsg }}
+
+
+ {{ order.errorMsg }}
diff --git a/src/views/payment/allocation/order/AllocationOrderList.vue b/src/views/payment/allocation/order/AllocationOrderList.vue
index 4338df46a..81f5550bb 100644
--- a/src/views/payment/allocation/order/AllocationOrderList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderList.vue
@@ -14,7 +14,7 @@
@sort-change="sortChange"
>
-
+
{{ row.allocationNo }}
@@ -40,11 +40,11 @@
- {{ dictConvert('AllocationOrderStatus', row.status) }}
+ {{ dictConvert('AllocOrderStatus', row.status) }}
- {{ dictConvert('AllocationOrderResult', row.result) }} {{ dictConvert('AllocOrderResult', row.result) }}
diff --git a/src/views/payment/allocation/receiver/AllocationReceiverList.vue b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
index 7e2883ec6..b16d4141f 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
@@ -28,14 +28,14 @@
- {{ dictConvert('AllocationReceiverType', row.receiverType) }}
+ {{ dictConvert('AllocReceiverType', row.receiverType) }}
- {{ dictConvert('AllocationRelationType', row.relationType) }}
+ {{ dictConvert('AllocRelationType', row.relationType) }}