diff --git a/src/views/payment/allocation/group/AllocationGroup.api.ts b/src/views/payment/allocation/group/AllocationGroup.api.ts index a99adf14..18299d9f 100644 --- a/src/views/payment/allocation/group/AllocationGroup.api.ts +++ b/src/views/payment/allocation/group/AllocationGroup.api.ts @@ -102,6 +102,16 @@ export function updateRate(receiverId, rate: number) { }) } +/** + * 编码是否存在 + */ +export function existsByNo(receiverNo) { + return defHttp.get>({ + url: '/allocation/group/existsByGroupNo', + params: { receiverNo }, + }) +} + /** * 设置默认分账组 */ @@ -126,6 +136,10 @@ export function cancelDefaultGroup(id) { * 分账组 */ export interface AllocationGroup extends BaseEntity { + /** + * 分账组编号 + */ + groupNo?: string /** * 分账组名称 */ @@ -156,10 +170,6 @@ export interface AllocationGroupReceiver extends BaseEntity { * 默认分账组 */ defaultGroup?: boolean - /** - * 接收方账号别名 - */ - name?: string /** * 分账比例 */ diff --git a/src/views/payment/allocation/group/AllocationGroupConfig.vue b/src/views/payment/allocation/group/AllocationGroupConfig.vue index 7f90cb6e..2561d97f 100644 --- a/src/views/payment/allocation/group/AllocationGroupConfig.vue +++ b/src/views/payment/allocation/group/AllocationGroupConfig.vue @@ -18,7 +18,6 @@ @edit-activated="editActivatedEvent" > - - + @@ -78,6 +80,8 @@ import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue' import PayRepairRecordInfo from '/@/views/payment/record/repair/PayRepairRecordInfo.vue' import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.vue' + import AllocationOrderInfo from '/@/views/payment/allocation/order/AllocationOrderInfo.vue' + import ALink from '/@/components/Link/Link.vue' // 使用hooks const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage) @@ -93,7 +97,7 @@ return [ { field: 'tradeNo', type: STRING, name: '本地交易号', placeholder: '请输入本地交易号' }, { field: 'bizTradeNo', type: STRING, name: '商户交易号', placeholder: '请输入商户交易号' }, - { field: 'bizTradeNo', type: STRING, name: '通道交易号', placeholder: '请输入通道交易号' }, + { field: 'outTradeNo', type: STRING, name: '通道交易号', placeholder: '请输入通道交易号' }, { field: 'syncType', type: LIST, @@ -124,6 +128,7 @@ const payOrderInfo = $ref() const refundOrderInfo = $ref() const payRepairRecordInfo = $ref() + const allocationOrderInfo = $ref() onMounted(() => { init() @@ -169,8 +174,10 @@ function showOrder(record) { if (record.syncType === 'pay') { payOrderInfo.init(record.tradeNo) - } else { + } else if (record.syncType === 'refund') { refundOrderInfo.init(record.tradeNo) + } else { + allocationOrderInfo.init(record.tradeNo) } }