diff --git a/src/api/ss/apiBill.js b/src/api/ss/apiBill.js new file mode 100644 index 0000000..fc913ff --- /dev/null +++ b/src/api/ss/apiBill.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询API收费订单列表 +export function listApiBill(query) { + return request({ + url: '/ss/apiBill/list', + method: 'get', + params: query + }) +} + +// 查询API收费订单详细 +export function getApiBill(billId) { + return request({ + url: '/ss/apiBill/' + billId, + method: 'get' + }) +} + +// 新增API收费订单 +export function addApiBill(data) { + return request({ + url: '/ss/apiBill', + method: 'post', + data: data + }) +} + +// 修改API收费订单 +export function updateApiBill(data) { + return request({ + url: '/ss/apiBill', + method: 'put', + data: data + }) +} + +// 删除API收费订单 +export function delApiBill(billId) { + return request({ + url: '/ss/apiBill/' + billId, + method: 'delete' + }) +} diff --git a/src/api/ss/transfer.js b/src/api/ss/transfer.js new file mode 100644 index 0000000..b38388e --- /dev/null +++ b/src/api/ss/transfer.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询转账列表 +export function listTransfer(query) { + return request({ + url: '/ss/transfer/list', + method: 'get', + params: query + }) +} + +// 查询转账详细 +export function getTransfer(batchId) { + return request({ + url: '/ss/transfer/' + batchId, + method: 'get' + }) +} + +// 新增转账 +export function addTransfer(data) { + return request({ + url: '/ss/transfer', + method: 'post', + data: data + }) +} + +// 修改转账 +export function updateTransfer(data) { + return request({ + url: '/ss/transfer', + method: 'put', + data: data + }) +} + +// 删除转账 +export function delTransfer(batchId) { + return request({ + url: '/ss/transfer/' + batchId, + method: 'delete' + }) +} + +// 刷新转账结果 +export function refreshTransferStatus(batchId) { + return request({ + url: `/ss/transfer/${batchId}/refresh`, + method: 'put' + }) +} diff --git a/src/api/ss/transferDetail.js b/src/api/ss/transferDetail.js new file mode 100644 index 0000000..f9dcd09 --- /dev/null +++ b/src/api/ss/transferDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询转账明细列表 +export function listTransferDetail(query) { + return request({ + url: '/ss/transferDetail/list', + method: 'get', + params: query + }) +} + +// 查询转账明细详细 +export function getTransferDetail(detailId) { + return request({ + url: '/ss/transferDetail/' + detailId, + method: 'get' + }) +} + +// 新增转账明细 +export function addTransferDetail(data) { + return request({ + url: '/ss/transferDetail', + method: 'post', + data: data + }) +} + +// 修改转账明细 +export function updateTransferDetail(data) { + return request({ + url: '/ss/transferDetail', + method: 'put', + data: data + }) +} + +// 删除转账明细 +export function delTransferDetail(detailId) { + return request({ + url: '/ss/transferDetail/' + detailId, + method: 'delete' + }) +} diff --git a/src/assets/icons/svg/transfer.svg b/src/assets/icons/svg/transfer.svg new file mode 100644 index 0000000..4b58716 --- /dev/null +++ b/src/assets/icons/svg/transfer.svg @@ -0,0 +1 @@ + diff --git a/src/components/Business/Transfer/TransferLink.vue b/src/components/Business/Transfer/TransferLink.vue new file mode 100644 index 0000000..69fd0b7 --- /dev/null +++ b/src/components/Business/Transfer/TransferLink.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/utils/constants.js b/src/utils/constants.js index 536cc19..1e87a9e 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -1,8 +1,12 @@ // 视图 +import { exp } from 'qrcode/lib/core/galois-field' + export const views = { user: 'user', // 用户 device: 'device', // 设备 store: 'store', // 店铺 + transfer: 'transfer', // 转账 + withdraw: 'withdraw', // 提现 } // 收款账户类型 @@ -52,3 +56,21 @@ export const ApiPriceType = { unit: "次" }, } + +/** + * 转账业务类型 + */ +export const TransferBstType = { + WITHDRAW: "1", // 提现 +} + +/** + * 转账状态 + */ +export const TransferStatus = { + WAIT_TRANSFER: "1", // 待转账 + TRANSFER_ING: "2", // 转账中 + TRANSFER_SUCCESS: "3", // 已转账 + TRANSFER_PART_SUCCESS: "4", // 部分成功 + TRANSFER_FAIL: "5", // 转账失败 +} diff --git a/src/views/ss/apiBill/index.vue b/src/views/ss/apiBill/index.vue new file mode 100644 index 0000000..50cdef3 --- /dev/null +++ b/src/views/ss/apiBill/index.vue @@ -0,0 +1,495 @@ + + + diff --git a/src/views/ss/channelWithdraw/index.vue b/src/views/ss/channelWithdraw/index.vue index 904cac5..f6a874b 100644 --- a/src/views/ss/channelWithdraw/index.vue +++ b/src/views/ss/channelWithdraw/index.vue @@ -123,6 +123,9 @@ + @@ -158,9 +161,9 @@ /> - + - + @@ -176,7 +179,7 @@ /> - + {{dict.label}} @@ -193,8 +196,15 @@ - - + + + + + + + + +
@@ -222,7 +232,7 @@ export default { dicts: ['account_type', 'withdraw_service_type'], data() { return { - span: 24, + span: 12, // 字段列表 columns: [ {key: 'channelId', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"}, @@ -233,6 +243,8 @@ export default { {key: 'serviceType', visible: true, label: '服务费收取类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'serviceRate', visible: true, label: '服务费', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'costRate', visible: true, label: '渠道成本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'minAmount', visible: true, label: '单笔最低', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'maxAmount', visible: true, label: '单笔最高', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, ], // 排序方式 orderSorts: ['ascending', 'descending', null], diff --git a/src/views/ss/transfer/detail.vue b/src/views/ss/transfer/detail.vue new file mode 100644 index 0000000..f7a5175 --- /dev/null +++ b/src/views/ss/transfer/detail.vue @@ -0,0 +1,73 @@ + + + diff --git a/src/views/ss/transfer/index.vue b/src/views/ss/transfer/index.vue new file mode 100644 index 0000000..ba27ae9 --- /dev/null +++ b/src/views/ss/transfer/index.vue @@ -0,0 +1,402 @@ + + + diff --git a/src/views/ss/transferDetail/index.vue b/src/views/ss/transferDetail/index.vue new file mode 100644 index 0000000..4070b2b --- /dev/null +++ b/src/views/ss/transferDetail/index.vue @@ -0,0 +1,349 @@ + + + diff --git a/src/views/system/withdraw/detail.vue b/src/views/system/withdraw/detail.vue index 2e520ee..fa58f60 100644 --- a/src/views/system/withdraw/detail.vue +++ b/src/views/system/withdraw/detail.vue @@ -1,66 +1,103 @@