pay/dax-pay-ui
1
0
Fork 0
mirror of https://gitee.com/bootx/dax-pay-ui synced 2026-08-04 20:36:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ref w删除分账相关内容

Browse Source
This commit is contained in:
bootx
2025-11-10 22:57:11 +08:00
parent 22860dfed1
commit 1bdccdbf48
25 changed files with 19 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/enums/daxpay/daxpayEnum.ts
View File

@@ -125,87 +125,6 @@ export enum AgentStatusEnum {
ENABLED = 'enable',
}
/**
* 乐刷分账能力开通状态枚举
*/
export enum LsAllocApplyStatusEnum {
/** 草稿 */
DRAFT = 'draft',
/** 未开通 */
NOT_OPENED = '0',
/** 已开通 */
OPENED = '1',
/** 商户主动关闭 */
MERCHANT_CLOSED = '2',
/** 待审核 */
PENDING_REVIEW = '3',
/** 冻结 */
FROZEN = '4',
/** 注销 */
CANCELLED = '5',
/** 待签合同 */
PENDING_CONTRACT = '6',
}
/**
* 随行付分账能力开通状态枚举
*/
export enum VbillAllocApplyEnum {
/** 草稿 */
DRAFT = 'draft',
/** 已发送链接, 未签约 */
SEND_LINK = '00',
/** 签约失败 */
SIGN_FAIL = '01',
/** 签约成功 */
SIGN_SUCCESS = '02',
/** 未签约 */
NOT_SIGN = '03',
/** 审批中 */
APPROVAL = '04',
}
/**
* 分账关系类型
*/
export enum AllocRelationTypeEnum {
/** 服务商 */
SERVICE_PROVIDER = 'service_provider',
/** 门店 */
STORE = 'store',
/** 员工 */
STAFF = 'staff',
/** 店主 */
STORE_OWNER = 'store_owner',
/** 合作伙伴 */
PARTNER = 'partner',
/** 总部 */
HEADQUARTER = 'headquarter',
/** 品牌方 */
BRAND = 'brand',
/** 分销商 */
DISTRIBUTOR = 'distributor',
/** 用户 */
USER = 'user',
/** 供应商 */
SUPPLIER = 'supplier',
/** 自定义 */
CUSTOM = 'custom',
}
/**
* 分账接收方类型
*/
export enum AllocReceiverTypeEnum {
/** 商户号 */
MERCHANT_NO = 'merchant_no',
/** userId */
USER_ID = 'user_id',
/** openId */
OPEN_ID = 'open_id',
/** 账号 */
LOGIN_NAME = 'login_name',
}
/**
* 进件申请状态

14
src/enums/daxpay/tradeStatusEnum.ts
View File

@@ -50,20 +50,6 @@ export enum PayRefundStatusEnum {
REFUNDED = 'refunded',
}
/**
* 支付订单的分账状态
*/
export enum PayAllocStatusEnum {
/**
* 待分账
*/
WAITING = 'waiting',
/**
* 已分账
*/
ALLOCATION = 'allocation',
}
/**
* 退款状态枚举
*/

2
src/views/daxpay/admin/isv/gateway/common/GatewayConfigEdit.vue
View File

@@ -66,8 +66,6 @@
aggregateShow: [{ required: true, message: '是否显示显示聚合收银码必选' }],
h5AutoUpgrade: [{ required: true, message: 'H5收银台自动升级聚合支付必选' }],
barPayShow: [{ required: true, message: '是否显示聚合条码支付必选' }],
miniAppAllocation: [{ required: true, message: '小程序是否分账必选' }],
miniAppAutoAllocation: [{ required: true, message: '小程序是否自动分账必选' }],
} as Record<string, Rule[]>
/**

8
src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfig.api.ts
View File

@@ -32,10 +32,6 @@ export interface IsvMiniQuicklyConfigParam extends BaseEntity {
isvNo?: string
/** 限制支付方式 */
limitPay?: string
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 关联终端号 */
terminalNo?: string
}
@@ -48,10 +44,6 @@ export interface IsvMiniQuicklyConfigResult extends BaseEntity {
isvNo?: string
/** 限制支付方式 */
limitPay?: string
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 关联终端号 */
terminalNo?: string
}

22
src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfigForm.vue
View File

@@ -15,18 +15,6 @@
<a-form-item label="服务商号" name="isvNo" :hidden="true">
<a-input v-model:value="form.isvNo" :disabled="showable" />
</a-form-item>
<a-form-item label="是否开启分账" name="allocation">
<a-radio-group v-model:value="form.allocation" :disabled="!edit" button-style="solid">
<a-radio :value="false">不开启</a-radio>
<a-radio :value="true">开启</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="自动分账" name="autoAllocation">
<a-radio-group v-model:value="form.autoAllocation" :disabled="!edit" button-style="solid">
<a-radio :value="false">不自动</a-radio>
<a-radio :value="true">自动</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="限制支付方式" name="limitPay">
<a-select
style="width: 250px"
@@ -76,16 +64,10 @@
// 表单
const formRef = ref<FormInstance>()
const form = ref<IsvMiniQuicklyConfigParam>({
allocation: false,
autoAllocation: false,
})
const form = ref<IsvMiniQuicklyConfigParam>({})
// 表单验证规则
const rules = {
allocation: [{ required: true, message: '是否开启分账必选' }],
autoAllocation: [{ required: true, message: '是否自动分账必选' }],
} as Record<string, Rule[]>
const rules = {} as Record<string, Rule[]>
/**
* 初始化数据

2
src/views/daxpay/common/channel/adapay/config/AdapayConfig.api.ts
View File

@@ -40,8 +40,6 @@ export interface AdaPayConfig extends MchEntity {
enable: boolean
// 是否沙箱环境
sandbox?: boolean
// 分账类型
allocType?: string
// 微信AppId
wxAppId?: string
// 微信AppSecret

8
src/views/daxpay/common/channel/adapay/config/AdapayConfigEdit.vue
View File

@@ -35,12 +35,6 @@
<a-form-item label="沙箱环境" name="sandbox">
<a-switch checked-children="是" un-checked-children="否" v-model:checked="form.sandbox" />
</a-form-item>
<!-- <a-form-item label="分账类型" name="allocType">-->
<!-- <a-radio-group v-model:value="form.allocType" button-style="solid">-->
<!-- <a-radio-button value="realtime">实时分账</a-radio-button>-->
<!-- <a-radio-button value="delay">延时分账</a-radio-button>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<a-form-item label="交易密钥" name="apiKey">
<a-input v-model:value="form.apiKey" placeholder="请输入汇付交易密钥" />
</a-form-item>
@@ -121,7 +115,6 @@
const form = ref<AdaPayConfig>({
enable: true,
sandbox: false,
allocType: 'realtime',
})
let rawForm: any = {}
// 校验
@@ -130,7 +123,6 @@
adaPayAppId: [{ required: true, message: '请输入汇付AppId' }],
enable: [{ required: true, message: '请选择是否启用' }],
sandbox: [{ required: true, message: '请选择是否为沙箱环境' }],
allocType: [{ required: true, message: '请选择是分账类型' }],
apiKey: [{ required: true, message: '请输入汇付交易密钥' }],
mchPrivateKey: [{ required: true, message: '请输入汇付商户RSA私钥' }],
// adaPayPublicKey: [{ required: true, message: '请输入汇平台RSA公钥' }],

2
src/views/daxpay/common/constant/channel/ChannelConst.api.ts
View File

@@ -51,8 +51,6 @@ export interface ChannelConst extends BaseEntity {
remark?: string
/** 是否支持服务商 */
isv?: boolean
/** 是否支持分账 */
allocatable?: boolean
/** 是否支持支付终端报送 */
terminal?: boolean
}

6
src/views/daxpay/common/constant/channel/ChannelConstList.vue
View File

@@ -33,12 +33,6 @@
<a-tag v-else color="red">不支持</a-tag>
</template>
</vxe-column>
<vxe-column field="allocatable" title="分账" :min-width="90" align="center">
<template #default="{ row }">
<a-tag v-if="row.allocatable" color="green">支持</a-tag>
<a-tag v-else color="red">不支持</a-tag>
</template>
</vxe-column>
<vxe-column field="terminal" title="终端报送" :min-width="90" align="center">
<template #default="{ row }">
<a-tag v-if="row.terminal" color="green">支持</a-tag>

8
src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
View File

@@ -88,10 +88,6 @@ export interface PayParam {
title?: string
/** 支付描述 */
description?: string
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 限制用户支付类型 */
limitPay?: string
/** 过期时间 */
@@ -283,10 +279,6 @@ export interface GatewayPayParam {
title?: string
/** 支付描述 */
description?: string
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 限制用户支付类型 */
limitPay?: string
/** 过期时间 */

16
src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
View File

@@ -56,20 +56,6 @@
placeholder="请输入支付金额"
/>
</a-form-item>
<a-form-item label="是否分账" name="allocation">
<a-switch
checked-children="是"
un-checked-children="否"
v-model:checked="form.allocation"
/>
</a-form-item>
<a-form-item label="是否自动分账" name="autoAllocation">
<a-switch
checked-children="是"
un-checked-children="否"
v-model:checked="form.autoAllocation"
/>
</a-form-item>
<a-form-item label="限制用户支付类型" name="limitPay">
<a-select
allow-clear
@@ -162,7 +148,6 @@
title: '测试收网关支付',
clientIp: '127.0.0.1',
amount: 0.1,
allocation: false,
})
const rules = computed(() => {
return {
@@ -172,7 +157,6 @@
bizOrderNo: [{ required: true, message: '订单号不可为空' }],
title: [{ required: true, message: '支付标题不可为空' }],
amount: [{ required: true, message: '支付金额不可为空' }],
allocation: [{ required: true, message: '分账不可为空' }],
clientIp: [{ required: true, message: '终端IP不可为空' }],
nonceStr: [{ required: true, message: '随机数不可为空' }],
reqTime: [{ required: true, message: '请求时间不可为空' }],

18
src/views/daxpay/common/develop/trade/DevelopTradePay.vue
View File

@@ -88,20 +88,6 @@
<a-form-item label="终端设备编码" name="terminalNo">
<a-input v-model:value="form.terminalNo" placeholder="请输入终端设备编码" />
</a-form-item>
<a-form-item label="是否分账" name="allocation">
<a-switch
checked-children="是"
un-checked-children="否"
v-model:checked="form.allocation"
/>
</a-form-item>
<a-form-item label="是否自动分账" name="autoAllocation">
<a-switch
checked-children="是"
un-checked-children="否"
v-model:checked="form.autoAllocation"
/>
</a-form-item>
<a-form-item label="限制用户支付类型" name="limitPay">
<a-select
allow-clear
@@ -216,8 +202,6 @@
title: '测试支付',
clientIp: '127.0.0.1',
amount: 0.01,
allocation: false,
autoAllocation: false,
})
const rules = computed(() => {
return {
@@ -231,8 +215,6 @@
{ required: form.method === PayMethodEnum.OTHER, message: '其他支付方式不可为空' },
],
authCode: [{ required: form.method === PayMethodEnum.BARCODE, message: '付款码不可为空' }],
allocation: [{ required: true, message: '分账不可为空' }],
autoAllocation: [{ required: true, message: '自动分账不可为空' }],
clientIp: [{ required: true, message: '终端IP不可为空' }],
nonceStr: [{ required: true, message: '随机数不可为空' }],
reqTime: [{ required: true, message: '请求时间不可为空' }],

8
src/views/daxpay/common/device/qrcode/CashierCode.api.ts
View File

@@ -182,10 +182,6 @@ export interface CashierCode extends MchEntity {
batchNo?: string
/** 读取系统配置 */
readSystem?: boolean
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 微信通道 */
wxChannel?: string
/** 微信支付方式 */
@@ -220,10 +216,6 @@ export interface CashierCodeBatch {
enable?: boolean
/** 读取系统配置 */
readSystem?: boolean
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 微信通道 */
wxChannel?: string
/** 微信支付方式 */

16
src/views/daxpay/common/device/qrcode/CashierCodeCreate.vue
View File

@@ -64,18 +64,7 @@
<a-radio :value="false">自定义</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="是否开启分账" name="allocation">
<a-radio-group v-model:value="form.allocation">
<a-radio :value="true">开启</a-radio>
<a-radio :value="false">关闭</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="自动分账" name="autoAllocation" v-if="form.allocation">
<a-radio-group v-model:value="form.autoAllocation">
<a-radio :value="true">开启</a-radio>
<a-radio :value="false">关闭</a-radio>
</a-radio-group>
</a-form-item>
<template v-if="!form.readSystem">
<a-form-item label="微信支付对应通道" name="wxChannel">
<a-select
@@ -171,7 +160,6 @@
let form = ref<CashierCodeBatch>({
enable: true,
readSystem: true,
allocation: false,
count: 1,
amountType: 'random',
})
@@ -249,8 +237,6 @@
readSystem: [{ required: true, message: '请选择码牌是否读取系统配置' }],
amountType: [{ required: true, message: '请选择金额类型' }],
amount: [{ required: true, message: '请输入收款金额' }],
allocation: [{ required: true, message: '请选择是否开启分账' }],
autoAllocation: [{ required: true, message: '请选择是否开启自动分账' }],
} as Record<string, Rule[]>
})

15
src/views/daxpay/common/device/qrcode/CashierCodeEdit.vue
View File

@@ -56,18 +56,7 @@
<a-radio :value="false">自定义</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="是否开启分账" name="allocation">
<a-radio-group v-model:value="form.allocation" :disabled="showable">
<a-radio :value="true">开启</a-radio>
<a-radio :value="false">关闭</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="自动分账" name="autoAllocation" v-if="form.allocation">
<a-radio-group v-model:value="form.autoAllocation" :disabled="showable">
<a-radio :value="true">开启</a-radio>
<a-radio :value="false">关闭</a-radio>
</a-radio-group>
</a-form-item>
<template v-if="!form.readSystem">
<a-form-item label="微信支付对应通道" name="wxChannel">
<a-select
@@ -237,8 +226,6 @@
readSystem: [{ required: true, message: '请选择码牌是否读取系统配置' }],
amountType: [{ required: true, message: '请选择金额类型' }],
amount: [{ required: true, message: '请输入收款金额' }],
allocation: [{ required: true, message: '请选择是否开启分账' }],
autoAllocation: [{ required: true, message: '请选择是否开启自动分账' }],
} as Record<string, Rule[]>
})
// 事件

4
src/views/daxpay/common/merchant/gateway/cashier/CashierCodeConfig.api.ts
View File

@@ -30,10 +30,6 @@ export function update(data: CashierCodeConfig) {
export interface CashierCodeConfig extends MchEntity {
/** 应用ID */
appId?: string
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 限制用户支付方式 */
limitPay?: string
/** 微信通道 */

35
src/views/daxpay/common/merchant/gateway/cashier/CashierCodeConfigForm.vue
View File

@@ -12,18 +12,6 @@
<a-form-item label="主键" name="id" :hidden="true">
<a-input v-model:value="form.id" :disabled="showable" />
</a-form-item>
<a-form-item label="是否开启分账" name="allocation">
<a-radio-group v-model:value="form.allocation" :disabled="!edit" button-style="solid">
<a-radio :value="false">否</a-radio>
<a-radio :value="true">是</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="自动分账" name="autoAllocation">
<a-radio-group v-model:value="form.autoAllocation" :disabled="!edit" button-style="solid">
<a-radio :value="false">否</a-radio>
<a-radio :value="true">是</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="限制支付方式" name="limitPay">
<a-select
style="width: 250px"
@@ -135,15 +123,10 @@
// 表单
const formRef = ref<FormInstance>()
const form = ref<CashierCodeConfig>({
autoAllocation: false,
})
const form = ref<CashierCodeConfig>({})
// 表单验证规则
const rules = {
allocation: [{ required: true, message: '分账必填' }],
autoAllocation: [{ required: true, message: '自动分账必选' }],
} as Record<string, Rule[]>
const rules = {} as Record<string, Rule[]>
/**
* 初始化通道
@@ -211,13 +194,9 @@
* 初始化数据
*/
function initData() {
confirmLoading.value = true
edit.value = false
// 根据应用ID查询配置
findByAppId(props.appId).then(({ data }) => {
form.value = data
confirmLoading.value = false
form.value.appId = props.appId
})
}
@@ -225,17 +204,19 @@
* 更新配置
*/
function updateConfig() {
formRef.value?.validate().then(async () => {
formRef.value?.validate().then(() => {
confirmLoading.value = true
update(form.value)
.then(() => {
edit.value = false
createMessage.success('更新成功')
edit.value = false
initData()
})
.finally(() => (confirmLoading.value = false))
.finally(() => {
confirmLoading.value = false
})
})
}
</script>
<style scoped lang="less"></style>
<style scoped></style>

8
src/views/daxpay/common/merchant/gateway/quickly/MiniQuicklyConfig.api.ts
View File

@@ -32,10 +32,6 @@ export interface MchMiniQuicklyConfigParam extends BaseEntity {
appId?: string
/** 限制支付方式 */
limitPay?: string
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 关联终端号 */
terminalNo?: string
}
@@ -48,10 +44,6 @@ export interface MchMiniQuicklyConfigResult extends BaseEntity {
appId?: string
/** 限制支付方式 */
limitPay?: string
/** 是否开启分账 */
allocation?: boolean
/** 自动分账 */
autoAllocation?: boolean
/** 关联终端号 */
terminalNo?: string
}

28
src/views/daxpay/common/merchant/gateway/quickly/MiniQuicklyConfigForm.vue
View File

@@ -15,18 +15,6 @@
<a-form-item label="应用ID" name="appId" :hidden="true">
<a-input v-model:value="form.appId" :disabled="showable" />
</a-form-item>
<a-form-item label="是否开启分账" name="allocation" v-if="!props.miniQuicklyReadSystem">
<a-radio-group v-model:value="form.allocation" :disabled="!edit" button-style="solid">
<a-radio :value="false">不开启</a-radio>
<a-radio :value="true">开启</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="自动分账" name="autoAllocation" v-if="!props.miniQuicklyReadSystem">
<a-radio-group v-model:value="form.autoAllocation" :disabled="!edit" button-style="solid">
<a-radio :value="false">不自动</a-radio>
<a-radio :value="true">自动</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="限制支付方式" name="limitPay" v-if="!props.miniQuicklyReadSystem">
<a-select
style="width: 250px"
@@ -85,21 +73,11 @@
// 表单
const formRef = ref<FormInstance>()
const form = ref<MchMiniQuicklyConfigParam>({
allocation: false,
autoAllocation: false,
})
const form = ref<MchMiniQuicklyConfigParam>({})
// 表单验证规则
const rules = computed(() => {
if (props.miniQuicklyReadSystem) {
// 当为只读系统时，不需要验证分账相关字段
return {} as Record<string, Rule[]>
}
return {
allocation: [{ required: true, message: '是否开启分账必选' }],
autoAllocation: [{ required: true, message: '是否自动分账必选' }],
} as Record<string, Rule[]>
return {} as Record<string, Rule[]>
})
/**
@@ -133,4 +111,4 @@
}
</script>
<style scoped lang="less"></style>
<style scoped lang="less"></style>

33
src/views/daxpay/common/order/pay/PayOrder.api.ts
View File

@@ -1,11 +1,7 @@
import { defHttp } from '@/utils/http/axios'
import { PageResult, Result } from '#/axios'
import { MchEntity } from '#/web'
import {
PayAllocStatusEnum,
PayRefundStatusEnum,
PayStatusEnum,
} from '@/enums/daxpay/tradeStatusEnum'
import { PayRefundStatusEnum, PayStatusEnum } from '@/enums/daxpay/tradeStatusEnum'
/**
* 分页
@@ -77,16 +73,6 @@ export function cancel(id) {
})
}
/**
* 触发分账
*/
export function allocation(id) {
return defHttp.post<Result<void>>({
url: '/order/pay/allocation',
params: { id },
})
}
/**
* 获取汇总金额
*/
@@ -118,17 +104,6 @@ export function cellStyle({ row, column }) {
return { color: 'red' }
}
}
// 分账状态
if (column.field == 'allocStatus') {
switch (row.allocStatus) {
case PayAllocStatusEnum.WAITING:
return { color: 'orange' }
case PayAllocStatusEnum.ALLOCATION:
return { color: 'green' }
default:
return { color: 'red' }
}
}
// 退款状态
if (column.field == 'refundStatus') {
switch (row.refundStatus) {
@@ -160,10 +135,6 @@ export interface PayOrder extends MchEntity {
outOrderNo?: string
// 描述
description?: any
// 是否支持分账
allocation?: boolean
// 自动分账
autoAllocation?: boolean
// 支付通道
channel?: string
// 支付方式
@@ -180,8 +151,6 @@ export interface PayOrder extends MchEntity {
status?: string
// 退款状态
refundStatus?: string
// 分账状态
allocStatus?: string
// 结算状态
settleStatus?: string
// 支付时间

16
src/views/daxpay/common/order/pay/PayOrderInfo.vue
View File

@@ -160,22 +160,6 @@
</a-col>
</a-row>
<a-divider />
<a-row :gutter="[16, 24]">
<a-col class="gutter-row" :span="8">
<div class="gutterItem">
<div class="leftTitle">自动分账</div>
<div class="rightContent"> {{ order.autoAllocation || '无' }}</div>
</div>
</a-col>
<a-col class="gutter-row" :span="8">
<div class="gutterItem">
<div class="leftTitle">分账状态</div>
<div class="rightContent">{{
dictConvert('pay_alloc_status', order.allocStatus) || '无'
}}</div>
</div>
</a-col>
</a-row>
<a-row :gutter="[16, 24]">
<a-col class="gutter-row" :span="8">
<div class="gutterItem">

64
src/views/daxpay/common/order/pay/PayOrderList.vue
View File

@@ -70,17 +70,6 @@
dictConvert('pay_refund_status', row.refundStatus) || ''
}}</template>
</vxe-column>
<vxe-column field="allocation" title="分账" :min-width="160">
<template #default="{ row }">
<a-tag v-if="row.allocation" color="green">支持</a-tag>
<a-tag v-else color="red">不支持</a-tag>
</template>
</vxe-column>
<vxe-column field="allocStatus" title="分账状态" :min-width="160">
<template #default="{ row }">
{{ dictConvert('pay_alloc_status', row.allocStatus) || '无' }}
</template>
</vxe-column>
<vxe-column field="createTime" title="创建时间" sortable :min-width="140" />
<vxe-column field="mchName" title="商户" :min-width="150" />
<vxe-column field="appName" title="应用" :min-width="150" />
@@ -105,14 +94,6 @@
<a-menu-item v-if="[PayStatusEnum.PROGRESS].includes(row.status)">
<a-link @click="cancelOrder(row)" danger>撤销</a-link>
</a-menu-item>
<a-menu-item
v-if="
row.allocStatus === PayAllocStatusEnum.WAITING &&
PayStatusEnum.SUCCESS === row.status
"
>
<a-link @click="allocationOrder(row)">分账</a-link>
</a-menu-item>
<a-menu-item
v-if="
[PayStatusEnum.SUCCESS].includes(row.status) &&
@@ -149,15 +130,7 @@
<script lang="ts" setup>
import { computed, onMounted, ref, watch } from 'vue'
import {
allocation,
close,
getTotalAmount,
page,
syncOrder,
cellStyle,
cancel,
} from './PayOrder.api'
import { close, getTotalAmount, page, syncOrder, cellStyle, cancel } from './PayOrder.api'
import useTablePage from '@/hooks/bootx/useTablePage'
import PayOrderInfo from './PayOrderInfo.vue'
import BQuery from '@/components/Bootx/Query/BQuery.vue'
@@ -169,11 +142,7 @@
import ALink from '@/components/Link/Link.vue'
import { LabeledValue } from 'ant-design-vue/lib/select'
import { Icon } from '@/components/Icon'
import {
PayAllocStatusEnum,
PayRefundStatusEnum,
PayStatusEnum,
} from '@/enums/daxpay/tradeStatusEnum'
import { PayRefundStatusEnum, PayStatusEnum } from '@/enums/daxpay/tradeStatusEnum'
import { dropdown as merchantDropdown } from '@/views/daxpay/common/assist/basic/MerchantQuery.api'
import { dropdownByMchNo as mchAppDropdown } from '@/views/daxpay/common/assist/basic/MchAppQuery.api'
import { PayMethodEnum } from '@/enums/daxpay/daxpayEnum'
@@ -201,7 +170,6 @@
const methodList = ref<LabeledValue[]>([])
const payStatusList = ref<LabeledValue[]>([])
const payRefundStatusList = ref<LabeledValue[]>([])
const payAllocStatusList = ref<LabeledValue[]>([])
// 查询条件
const fields = computed(() => {
@@ -215,15 +183,6 @@
placeholder: '请输入外部三方支付系统中的订单号',
},
{ field: 'title', type: STRING, name: '标题', placeholder: '请输入标题' },
{
field: 'allocation',
name: '支持分账',
type: LIST,
selectList: [
{ label: '支持', value: 'true' },
{ label: '不支持', value: 'false' },
],
},
{ field: 'channel', name: '支付通道', type: LIST, selectList: channelList.value },
{ field: 'method', name: '支付方式', type: LIST, selectList: methodList.value },
{ field: 'status', name: '支付状态', type: LIST, selectList: payStatusList.value },
@@ -233,7 +192,6 @@
type: LIST,
selectList: payRefundStatusList.value,
},
{ field: 'allocStatus', name: '分账状态', type: LIST, selectList: payAllocStatusList.value },
{
field: 'mchNo',
type: LIST,
@@ -290,7 +248,6 @@
methodList.value = await dictDropDown('pay_method') //获取查询支付方式下拉列表
payStatusList.value = await dictDropDown('pay_status') //获取查询支付状态下拉列表
payRefundStatusList.value = await dictDropDown('pay_refund_status') //获取查询退款状态下拉列表
payAllocStatusList.value = await dictDropDown('pay_alloc_status') //获取分账状态状态下拉列表
}
/**
@@ -391,23 +348,6 @@
function refund(record) {
refundModel.value.init(record.id)
}
/**
* 触发分账
*/
function allocationOrder(record) {
createConfirm({
iconType: 'warning',
title: '警告',
content: '是否触发该订单的分账操作',
onOk: () => {
allocation(record.id).then(() => {
createMessage.success('分账请求已发送')
queryPage()
})
},
})
}
</script>
<style lang="less" scoped></style>

7
src/views/daxpay/common/order/refund/RefundOrder.api.ts
View File

@@ -1,12 +1,7 @@
import { defHttp } from '@/utils/http/axios'
import { PageResult, Result } from '#/axios'
import { MchEntity } from '#/web'
import {
PayAllocStatusEnum,
PayRefundStatusEnum,
PayStatusEnum,
RefundStatusEnum,
} from '@/enums/daxpay/tradeStatusEnum'
import { RefundStatusEnum } from '@/enums/daxpay/tradeStatusEnum'
/**
* 分页

6
src/views/daxpay/merchant/app/MchAppList.vue
View File

@@ -24,12 +24,6 @@
<a> 更多 <Icon icon="ant-design:down-outlined" :size="12" /> </a>
<template #overlay>
<a-menu>
<!-- <a-menu-item>-->
<!-- <a-link @click="showNotifyConfig(item)">订阅配置</a-link>-->
<!-- </a-menu-item>-->
<!-- <a-menu-item>-->
<!-- <a-link @click="showAllocConfig(item)">分账配置</a-link>-->
<!-- </a-menu-item>-->
<a-menu-item>
<a-link @click="showGatewayPay(item)">网关支付</a-link>
</a-menu-item>

2
src/views/daxpay/merchant/info/MerchantInfo.vue
View File

@@ -107,8 +107,6 @@
</a-button>
<template #overlay>
<a-menu>
<!-- <a-menu-item @click="showNotifyConfig(item)">订阅配置</a-menu-item>-->
<!-- <a-menu-item @click="showAllocConfig(item)">分账配置</a-menu-item>-->
<a-menu-item @click="showGatewayPay(item)">网关支付</a-menu-item>
<a-menu-item @click="toggleDefaultApp(item)">
{{ item?.defaultApp ? '清除默认' : '设为默认' }}