diff --git a/src/enums/daxpay/daxpayEnum.ts b/src/enums/daxpay/daxpayEnum.ts index 85cb65e17..c2ba599e7 100644 --- a/src/enums/daxpay/daxpayEnum.ts +++ b/src/enums/daxpay/daxpayEnum.ts @@ -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', -} /** * 进件申请状态 diff --git a/src/enums/daxpay/tradeStatusEnum.ts b/src/enums/daxpay/tradeStatusEnum.ts index 42bcd9bf5..d636c3f3f 100644 --- a/src/enums/daxpay/tradeStatusEnum.ts +++ b/src/enums/daxpay/tradeStatusEnum.ts @@ -50,20 +50,6 @@ export enum PayRefundStatusEnum { REFUNDED = 'refunded', } -/** - * 支付订单的分账状态 - */ -export enum PayAllocStatusEnum { - /** - * 待分账 - */ - WAITING = 'waiting', - /** - * 已分账 - */ - ALLOCATION = 'allocation', -} - /** * 退款状态枚举 */ diff --git a/src/views/daxpay/admin/isv/gateway/common/GatewayConfigEdit.vue b/src/views/daxpay/admin/isv/gateway/common/GatewayConfigEdit.vue index 6d87bb40c..fc797dc44 100644 --- a/src/views/daxpay/admin/isv/gateway/common/GatewayConfigEdit.vue +++ b/src/views/daxpay/admin/isv/gateway/common/GatewayConfigEdit.vue @@ -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 /** diff --git a/src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfig.api.ts b/src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfig.api.ts index ec832a551..3f2d1a7dc 100644 --- a/src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfig.api.ts +++ b/src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfig.api.ts @@ -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 } diff --git a/src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfigForm.vue b/src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfigForm.vue index 21df9bceb..d5604ac62 100644 --- a/src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfigForm.vue +++ b/src/views/daxpay/admin/isv/gateway/quickly/MiniQuicklyConfigForm.vue @@ -15,18 +15,6 @@ - - - 不开启 - 开启 - - - - - 不自动 - 自动 - - () - const form = ref({ - allocation: false, - autoAllocation: false, - }) + const form = ref({}) // 表单验证规则 - const rules = { - allocation: [{ required: true, message: '是否开启分账必选' }], - autoAllocation: [{ required: true, message: '是否自动分账必选' }], - } as Record + const rules = {} as Record /** * 初始化数据 diff --git a/src/views/daxpay/common/channel/adapay/config/AdapayConfig.api.ts b/src/views/daxpay/common/channel/adapay/config/AdapayConfig.api.ts index 6707816af..5d5c4a17f 100644 --- a/src/views/daxpay/common/channel/adapay/config/AdapayConfig.api.ts +++ b/src/views/daxpay/common/channel/adapay/config/AdapayConfig.api.ts @@ -40,8 +40,6 @@ export interface AdaPayConfig extends MchEntity { enable: boolean // 是否沙箱环境 sandbox?: boolean - // 分账类型 - allocType?: string // 微信AppId wxAppId?: string // 微信AppSecret diff --git a/src/views/daxpay/common/channel/adapay/config/AdapayConfigEdit.vue b/src/views/daxpay/common/channel/adapay/config/AdapayConfigEdit.vue index ab98cdf81..bf6a5b9cf 100644 --- a/src/views/daxpay/common/channel/adapay/config/AdapayConfigEdit.vue +++ b/src/views/daxpay/common/channel/adapay/config/AdapayConfigEdit.vue @@ -35,12 +35,6 @@ - - - - - - @@ -121,7 +115,6 @@ const form = ref({ 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公钥' }], diff --git a/src/views/daxpay/common/constant/channel/ChannelConst.api.ts b/src/views/daxpay/common/constant/channel/ChannelConst.api.ts index 4e8b935f5..a7883597a 100644 --- a/src/views/daxpay/common/constant/channel/ChannelConst.api.ts +++ b/src/views/daxpay/common/constant/channel/ChannelConst.api.ts @@ -51,8 +51,6 @@ export interface ChannelConst extends BaseEntity { remark?: string /** 是否支持服务商 */ isv?: boolean - /** 是否支持分账 */ - allocatable?: boolean /** 是否支持支付终端报送 */ terminal?: boolean } diff --git a/src/views/daxpay/common/constant/channel/ChannelConstList.vue b/src/views/daxpay/common/constant/channel/ChannelConstList.vue index d317fd59d..5dddb98b0 100644 --- a/src/views/daxpay/common/constant/channel/ChannelConstList.vue +++ b/src/views/daxpay/common/constant/channel/ChannelConstList.vue @@ -33,12 +33,6 @@ 不支持 - - -