diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
index a3d346b8d..0fce5f7b5 100644
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
@@ -32,6 +32,10 @@ export function getConfig(appId) {
export interface AllocConfig extends MchEntity {
/** 是否自动分账 */
autoAlloc?: boolean
+ /** 自动完结 */
+ autoFinish?: boolean
/** 大于多少开启分账 */
minAmount?: number
+ /** 分账延迟时长(分钟) */
+ DelayTime?: number
}
diff --git a/src/views/daxpay/common/allocation/order/AllocDetailList.vue b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
index 4e1c65969..28280a20d 100644
--- a/src/views/daxpay/common/allocation/order/AllocDetailList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
@@ -8,46 +8,51 @@
@close="visible = false"
>
-
-
-
-
-
-
-
- {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-
-
-
- {{ row.rate }}%
-
-
- {{ row.amount }} 元
-
-
- {{ dictConvert('alloc_detail_result', row.result) }}
-
-
- {{ row.errorMsg }}
-
-
- {{ row.finishTime }}
-
-
-
-
- 查看
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ dictConvert('alloc_receiver_type', row.receiverType) }}
+
+
+
+ {{ row.rate }}%
+
+
+ {{ row.amount }} 元
+
+
+
+ {{ dictConvert('alloc_detail_result', row.result) }}
+
+
+
+ {{ row.errorMsg }}
+
+
+ {{ row.finishTime }}
+
+
+
+
+ 查看
+
+
+
+
+
+
@@ -58,7 +63,7 @@
import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
import { useDict } from '@/hooks/bootx/useDict'
import { AllocOrder, AllocDetail, detailList } from './AllocationOrder.api'
- import AllocDetailInfo from "./AllocDetailInfo.vue";
+ import AllocDetailInfo from './AllocDetailInfo.vue'
// 使用hooks
const { loading } = useTablePage(queryPage)
const { dictConvert } = useDict()
diff --git a/src/views/daxpay/common/allocation/order/AllocOrderList.vue b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
index 091f6e7a9..f6a63d093 100644
--- a/src/views/daxpay/common/allocation/order/AllocOrderList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
@@ -11,86 +11,89 @@
-
-
-
-
-
- {{ row.allocNo }}
-
-
-
-
-
-
-
- {{ row.orderNo }}
-
-
-
-
-
-
- {{ dictConvert('channel', row.channel) }}
-
-
-
-
- {{ row.amount }}
-
-
-
-
- {{ dictConvert('allocation_status', row.status) }}
-
-
-
-
- {{ dictConvert('allocation_result', row.result) }}
-
-
-
-
- 查看
-
- 明细列表
-
-
-
- 更多
-
+
+
+
+
+
+
+ {{ row.allocNo }}
-
-
-
- 重试
-
-
- 同步
-
-
- 完结
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ row.orderNo }}
+
+
+
+
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+
+
+ {{ row.amount }}
+
+
+
+
+ {{ dictConvert('allocation_status', row.status) }}
+
+
+
+
+ {{ dictConvert('allocation_result', row.result) }}
+
+
+
+
+ 查看
+
+ 明细列表
+
+
+
+ 更多
+
+
+
+
+
+ 重试
+
+
+ 同步
+
+
+ 完结
+
+
+
+
+
+
+
+
{
- sync(record.allocNo).then(() => {
+ sync(record.id).then(() => {
createMessage.success('同步成功')
queryPage()
})
@@ -226,10 +229,10 @@
function retryInfo(record) {
createConfirm({
iconType: 'info',
- title: '分账重试',
- content: '确定分账重试吗?',
+ title: '重试分账',
+ content: '确定重试分账吗?',
onOk: () => {
- retry(record.bizAllocNo).then(() => {
+ retry(record.id).then(() => {
createMessage.success('分账重试请求发送成功')
queryPage()
})
@@ -246,7 +249,7 @@
title: '完结分账',
content: '确定完结分账吗?',
onOk: () => {
- finish(record.allocNo).then(() => {
+ finish(record.id).then(() => {
createMessage.success('完结请求发送成功')
queryPage()
})
diff --git a/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
index 286f7a07f..d6f4944ae 100644
--- a/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
+++ b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
@@ -22,26 +22,6 @@ export function get(id) {
})
}
-/**
- * 获取订单详细信息
- */
-export function getOrderByAllocNo(allocNo: string) {
- return defHttp.get({
- url: '/allocation/order/findByAllocNo',
- params: { allocNo },
- })
-}
-
-/**
- * 扩展信息
- */
-export function getExtra(id) {
- return defHttp.get>({
- url: '/allocation/order/findById',
- params: { id },
- })
-}
-
/**
* 明细列表
*/
@@ -65,30 +45,30 @@ export function detail(id) {
/**
* 分账完结
*/
-export function finish(allocNo) {
+export function finish(id) {
return defHttp.post>({
url: '/allocation/order/finish',
- params: { allocNo },
+ params: { id },
})
}
/**
- * 分账完结
+ * 分账重试
*/
-export function retry(bizAllocNo) {
+export function retry(id) {
return defHttp.post>({
url: '/allocation/order/retry',
- params: { bizAllocNo },
+ params: { id },
})
}
/**
- * 查询分账结果
+ * 同步分账结果
*/
-export function sync(allocNo) {
+export function sync(id) {
return defHttp.post>({
url: '/allocation/order/sync',
- params: { allocNo },
+ params: { id },
})
}