+ 取消
+ 更新
+ 编辑信息
+
+
-
+
+
+
+
+
+
+
-
-
-
-
-
- 网关后台地址
-
-
-
-
-
-
- 网关前端地址
-
-
-
-
-
-
- 全局支付限额(元)
-
-
-
-
-
-
+
- 取消
- 更新
- 编辑信息
-
-
+
+
+
+
+
+
+
+ 检查
+
+
+
+
+
+
+ 检查
+
+
+
+
+
+
+
+
+ 检查
+
+
+
+
+
+
+ 检查
+
+
+
+
+
+
+
+ 取消
+ 更新
+ 编辑信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 更新
+ 编辑信息
+
+
-
-
-
-
+
diff --git a/types/web.d.ts b/types/web.d.ts
index a3c9bc26..b5d200ae 100644
--- a/types/web.d.ts
+++ b/types/web.d.ts
@@ -34,6 +34,10 @@ export interface BaseEntity {
* 商户应用基础实体对象
*/
export interface MchEntity extends BaseEntity {
+ // 商户号
+ mchNo?: string
+ // 商户名称
+ mchName?: string
// 应用号
appId?: string
// 应用名称
- 订单数量
-
-
- 订单金额(元)
-
-
- 平均单笔金额(元)
-
-
- 最大单笔金额(元)
-
-
- 订单数量
-
-
- 订单金额(元)
-
-
- 平均单笔金额(元)
-
-
- 最大单笔金额(元)
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/dashboard/components/VisitSource.vue b/src/views/daxpay/admin/dashboard/components/VisitSource.vue
index 8211d12c..bc8c0268 100644
--- a/src/views/daxpay/admin/dashboard/components/VisitSource.vue
+++ b/src/views/daxpay/admin/dashboard/components/VisitSource.vue
@@ -1,51 +1,95 @@
-
+
+
+
+ 支付订单
+
+
+
+ 
+
+
+
+ 订单数量
+
+
+
+ 
+
+
+
+ 订单金额
+
+
+
+ 
+
+
+
+ 平均单笔金额
+
+
+
+ 
+
+
+
+ 最大单笔金额
+
+
+
+
+ 退款订单
+
+
+
+
+
+
+ 订单数量
+
+
+
+
+
+
+
+
+
+
+ 订单金额
+
+
+
+
+
+
+
+
+
+
+
+ 平均单笔金额
+
+
+
+
+
+
+ 最大单笔金额
+
+
+
+
+
+
+
+
+
+
+
+
+ 通知公告
+
+
+
+
+ 公告{{ item }}
+ 2025-06-01
+
+
+ 商户信息
+
+
+
+
+ 商户
+
+
+
+
+ 商户应用
+
+
+
-
-
-
-
-
-
-
-
-
+ ([])
+
const xTable = ref()
const xToolbar = ref()
const mchApp = ref()
const channelSetup = ref()
const merchantNotifyConfigList = ref()
- const allocationConfigModel = ref()
- const terminalDeviceList = ref()
const gatewayConfigModel = ref()
onMounted(() => {
@@ -159,6 +158,9 @@
* 初始化数据
*/
async function initData() {
+ merchantDropdown().then(({ data }) => {
+ mchNoOptions.value = data
+ })
}
function vxeBind() {
@@ -202,25 +204,11 @@
merchantNotifyConfigList.value.init(record.appId)
}
- /**
- * 分账配置
- */
- function showAllocConfig(record) {
- allocationConfigModel.value.init(record.appId)
- }
-
/**
* 网关支付配置
*/
function showGatewayPay(record) {
- gatewayConfigModel.value.init(record.appId)
- }
-
- /**
- * 收银终端
- */
- function showTerminalDevice(record) {
- terminalDeviceList.value.init(record.appId)
+ gatewayConfigModel.value.init(record)
}
/**
diff --git a/src/views/daxpay/admin/merchant/info/Merchant.api.ts b/src/views/daxpay/admin/merchant/info/Merchant.api.ts
new file mode 100644
index 00000000..2f2393e3
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/info/Merchant.api.ts
@@ -0,0 +1,90 @@
+import { defHttp } from '@/utils/http/axios'
+import { PageResult, Result } from '#/axios'
+import { BaseEntity } from '#/web'
+
+/**
+ * 分页
+ */
+export const page = (params) => {
+ return defHttp.get>>({
+ url: '/admin/merchant/page',
+ params,
+ })
+}
+/**
+ * 详情
+ */
+export const get = (id) => {
+ return defHttp.get>({
+ url: '/admin/merchant/findById',
+ params: { id },
+ })
+}
+/**
+ * 创建商户
+ */
+export const add = (obj) => {
+ return defHttp.post>({
+ url: '/admin/merchant/add',
+ data: obj,
+ })
+}
+/**
+ * 更新商户
+ */
+export const update = (obj) => {
+ return defHttp.post>({
+ url: '/admin/merchant/update',
+ data: obj,
+ })
+}
+
+/**
+ * 删除
+ */
+export const del = (id) => {
+ return defHttp.post>({
+ url: '/admin/merchant/delete',
+ params: { id },
+ })
+}
+
+/**
+ * 商户
+ */
+export interface Merchant extends BaseEntity {
+ // 商户号
+ mchNo?: string
+ // 商户名称
+ mchName?: string
+ // 商户类型
+ merchantType?: string
+ // 是否有关联管理员
+ administrator?: boolean
+ // 状态
+ status?: string
+ // 创建默认应用
+ createDefaultApp?: boolean
+}
+
+/**
+ * 商户创建参数
+ */
+export interface MerchantCreate {
+ // 商户名称
+ mchName?: string
+ // 代理商
+ agentNo?: string
+ // 创建默认应用
+ createDefaultApp?: boolean
+ // 状态
+ status?: string
+ // 管理员名称
+ name?: string
+ // 商户管理员账号
+ account?: string
+ // 商户管理员密码
+ password?: string
+ // 重复密码
+ confirmPassword?: string
+}
diff --git a/src/views/daxpay/admin/merchant/info/MerchantCreate.vue b/src/views/daxpay/admin/merchant/info/MerchantCreate.vue
new file mode 100644
index 00000000..bf5fd101
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/info/MerchantCreate.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/merchant/info/MerchantEdit.vue b/src/views/daxpay/admin/merchant/info/MerchantEdit.vue
new file mode 100644
index 00000000..bc24f60d
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/info/MerchantEdit.vue
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/merchant/info/MerchantList.vue b/src/views/daxpay/admin/merchant/info/MerchantList.vue
new file mode 100644
index 00000000..8cb09592
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/info/MerchantList.vue
@@ -0,0 +1,214 @@
+
+ >>({
+ url: '/merchant/user/page',
+ params,
+ })
+}
+
+/**
+ * 用户详情
+ */
+export function get(id) {
+ return defHttp.get>({
+ url: '/merchant/user/findById',
+ params: { id },
+ })
+}
+
+/**
+ * 修改用户
+ */
+export function update(params) {
+ return defHttp.post({
+ url: '/merchant/user/update',
+ data: params,
+ })
+}
+
+/**
+ * 重置密码
+ */
+export function restartPassword(userId, newPassword) {
+ return defHttp.post({
+ url: '/merchant/user/restartPassword',
+ data: { userId, newPassword },
+ })
+}
+
+/**
+ * 批量重置密码
+ */
+export function restartPasswordBatch(userIds, newPassword) {
+ return defHttp.post({
+ url: '/merchant/user/restartPasswordBatch',
+ data: { userIds, newPassword },
+ })
+}
+
+/**
+ * 封禁用户
+ */
+export function banUser(userId) {
+ return defHttp.post({
+ url: '/merchant/user/ban',
+ params: { userId },
+ })
+}
+
+/**
+ * 封禁用户 批量
+ */
+export function banUserBatch(userIds) {
+ return defHttp.post({
+ url: '/merchant/user/banBatch',
+ data: userIds,
+ })
+}
+
+/**
+ * 解锁用户
+ */
+export function unlockUser(userId) {
+ return defHttp.post({
+ url: '/merchant/user/unlock',
+ params: { userId },
+ })
+}
+
+/**
+ * 解锁用户
+ */
+export function unlockUserBatch(userIds) {
+ return defHttp.post({
+ url: '/merchant/user/unlockBatch',
+ data: userIds,
+ })
+}
+
+/**
+ * 商户用户信息
+ */
+export interface MerchantUserInfo extends UserInfo, MchEntity {}
diff --git a/src/views/daxpay/admin/merchant/user/MerchantUserList.vue b/src/views/daxpay/admin/merchant/user/MerchantUserList.vue
new file mode 100644
index 00000000..fb6ebd93
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/user/MerchantUserList.vue
@@ -0,0 +1,239 @@
+
+
+
+
+
+ {{ form.account }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/merchant/user/UserResetPwd.vue b/src/views/daxpay/admin/merchant/user/UserResetPwd.vue
new file mode 100644
index 00000000..5bb0c441
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/user/UserResetPwd.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/merchant/user/UserShow.vue b/src/views/daxpay/admin/merchant/user/UserShow.vue
new file mode 100644
index 00000000..ea1694de
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/user/UserShow.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
+ {{ form.account
+ }}重置密码
+
+
+ {{ form.name || '无' }}
+
+ {{ form.phone || '无' }}
+
+ {{ form.email || '无' }}
+
+
+ 是
+ 否
+
+
+ {{ dictConvert('user_status', form.status) || '无' }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/allocation/AllocationConfigModel.vue b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
deleted file mode 100644
index edbae1dd..00000000
--- a/src/views/daxpay/common/allocation/AllocationConfigModel.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
deleted file mode 100644
index 72b685fc..00000000
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { Result } from '#/axios'
-import { MchEntity } from '#/web'
-
-/**
- * 保存
- */
-export function saveConfig(data: AllocConfig) {
- return defHttp.post>({ url: '/allocation/config/save', data })
-}
-
-/**
- * 更新
- */
-export function updateConfig(data: AllocConfig) {
- return defHttp.post>({ url: '/allocation/config/update', data })
-}
-
-/**
- * 根据应用ID查询
- */
-export function getConfig(appId) {
- return defHttp.get>({
- url: '/allocation/config/findByAppId',
- params: { appId },
- })
-}
-
-/**
- * 分账配置参数
- */
-export interface AllocConfig extends MchEntity {
- /** 是否自动分账 */
- autoAlloc?: boolean
- /** 自动完结 */
- autoFinish?: boolean
- /** 大于多少开启分账 */
- minAmount?: number
- /** 分账延迟时长(分钟) */
- delayTime?: number
-}
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.vue b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
deleted file mode 100644
index d5409b72..00000000
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
- 自动分账
-
-
-
- 关闭
- 开启
-
-
-
-
-
- 自动完结
-
-
-
- 关闭
- 开启
-
-
-
-
-
-
- 自动分账起始金额(元)
-
-
-
-
-
-
- 分账延迟时间(分钟)
-
-
-
-
-
- 取消
- {{
- form.id ? '更新' : '保存'
- }}
- 编辑信息
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroup.api.ts b/src/views/daxpay/common/allocation/group/AllocationGroup.api.ts
deleted file mode 100644
index e1474db3..00000000
--- a/src/views/daxpay/common/allocation/group/AllocationGroup.api.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { PageResult, Result } from '#/axios'
-import { BaseEntity, MchEntity } from '#/web'
-
-/**
- * 分页查询
- */
-export function page(params) {
- return defHttp.get>>({
- url: '/allocation/group/page',
- params,
- })
-}
-
-/**
- * 查询详情
- */
-export function get(id) {
- return defHttp.get>({
- url: '/allocation/group/findById',
- params: { id },
- })
-}
-
-/**
- * 查询分账接收方信息
- */
-export function getReceivers(groupId) {
- return defHttp.get>({
- url: '/allocation/group/findReceiversByGroups',
- params: { groupId },
- })
-}
-
-/**
- * 创建
- */
-export function add(data: AllocGroup) {
- return defHttp.post>({
- url: '/allocation/group/create',
- data,
- })
-}
-
-/**
- * 修改
- */
-export function update(data: AllocGroup) {
- return defHttp.post>({
- url: '/allocation/group/update',
- data,
- })
-}
-
-/**
- * 删除
- */
-export function del(id) {
- return defHttp.post({
- url: '/allocation/group/delete',
- params: { id },
- })
-}
-
-/**
- * 批量绑定接收者
- */
-export function bindReceivers(data) {
- return defHttp.post({
- url: '/allocation/group/bindReceivers',
- data,
- })
-}
-
-/**
- * 批量取消绑定接收者
- */
-export function unbindReceivers(data: { groupId: string; receiverIds: string[] }) {
- return defHttp.post({
- url: '/allocation/group/unbindReceivers',
- data,
- })
-}
-
-/**
- * 取消绑定接收者
- */
-export function unbindReceiver(receiverId) {
- return defHttp.post({
- url: '/allocation/group/unbindReceiver',
- params: { receiverId },
- })
-}
-
-/**
- * 修改分账比例
- */
-export function updateRate(receiverId, rate: number) {
- return defHttp.post({
- url: '/allocation/group/updateRate',
- params: { receiverId, rate },
- })
-}
-
-/**
- * 编码是否存在
- */
-export function existsByNo(groupNo, appId) {
- return defHttp.get>({
- url: '/allocation/group/existsByGroupNo',
- params: { groupNo, appId },
- })
-}
-
-/**
- * 设置默认分账组
- */
-export function setDefaultGroup(id) {
- return defHttp.post({
- url: '/allocation/group/setDefault',
- params: { id },
- })
-}
-
-/**
- * 取消默认分账组
- */
-export function cancelDefaultGroup(id) {
- return defHttp.post({
- url: '/allocation/group/clearDefault',
- params: { id },
- })
-}
-
-/**
- * 分账组
- */
-export interface AllocGroup extends MchEntity {
- /**
- * 分账组编号
- */
- groupNo?: string
- /**
- * 分账组名称
- */
- name?: string
- /**
- * 通道
- */
- channel?: string
- /**
- * 总分账比例
- */
- totalRate?: number
- /**
- * 是否为默认分账组
- */
- defaultGroup?: boolean
- /**
- * 分账组描述
- */
- remark?: string
-}
-
-/**
- * 分账组接收方信息
- */
-export interface AllocGroupReceiver extends BaseEntity {
- /**
- * 分账接收方ID
- */
- receiverId?: string
- /**
- * 名称
- */
- name?: string
- /**
- * 分账比例
- */
- rate?: number
- /**
- * 分账接收方类型
- */
- receiverType?: string
- /**
- * 分账接收方账号
- */
- receiverAccount?: string
- /**
- * 分账接收方名称
- */
- receiverName?: string
- /**
- * 分账关系类型
- */
- relationType?: string
- /**
- * 关系名称
- */
- relationName?: string
-}
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupConfig.vue b/src/views/daxpay/common/allocation/group/AllocationGroupConfig.vue
deleted file mode 100644
index 573e7d29..00000000
--- a/src/views/daxpay/common/allocation/group/AllocationGroupConfig.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
-
- 添加分账方
-
-
-
-
-
-
- {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-
-
-
- {{ row.rate }}%
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue b/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
deleted file mode 100644
index f94c20c6..00000000
--- a/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
- 取消
- 保存
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupList.vue b/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
deleted file mode 100644
index d1edc4f1..00000000
--- a/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
+++ /dev/null
@@ -1,268 +0,0 @@
-
-
-
-
-
-
-
-
- {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-
-
-
- 取消
- 选择
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue b/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue
deleted file mode 100644
index bcb44a2f..00000000
--- a/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
- {{ order.receiverNo }}
-
-
- {{ order.name }}
-
-
- {{ order.receiverName }}
-
-
- {{ dictConvert('alloc_receiver_type', order.receiverType) }}
-
- {{ order.rate }}%
- {{ order.amount }}
-
- {{ dictConvert('alloc_detail_result', order.result) }}
-
-
- {{ order.finishTime }}
-
-
- {{ order.errorCode }}
-
-
- {{ order.errorMsg }}
-
-
-
-
-
- 取消
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/order/AllocDetailList.vue b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
deleted file mode 100644
index 28280a20..00000000
--- a/src/views/daxpay/common/allocation/order/AllocDetailList.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue b/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
deleted file mode 100644
index 50c8a001..00000000
--- a/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
- {{ order.allocNo }}
-
-
- {{ order.orderNo }}
-
-
- {{ order.bizAllocNo }}
-
-
- {{ order.bizOrderNo }}
-
-
- {{ order.outOrderNo }}
-
-
- {{ order.outOrderNo }}
-
-
- {{ dictConvert('channel', order.channel) }}
-
- {{ order.amount }}
-
- {{ dictConvert('allocation_status', order.status) }}
-
-
- {{ dictConvert('allocation_result', order.result) }}
-
-
- {{ order.finishTime }}
-
-
- {{ order.errorCode }}
-
-
- {{ order.errorMsg }}
-
-
-
-
-
- 取消
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/order/AllocOrderList.vue b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
deleted file mode 100644
index 7b06dc52..00000000
--- a/src/views/daxpay/common/allocation/order/AllocOrderList.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-
- >>({
- url: '/allocation/order/page',
- params,
- })
-}
-
-/**
- * 查询详情
- */
-export function get(id) {
- return defHttp.get>({
- url: '/allocation/order/findById',
- params: { id },
- })
-}
-
-/**
- * 明细列表
- */
-export function detailList(orderId) {
- return defHttp.get>({
- url: '/allocation/order/detail/findAll',
- params: { orderId },
- })
-}
-
-/**
- * 明细详情
- */
-export function detail(id) {
- return defHttp.get>({
- url: '/allocation/order/detail/findById',
- params: { id },
- })
-}
-
-/**
- * 分账完结
- */
-export function finish(id) {
- return defHttp.post>({
- url: '/allocation/order/finish',
- params: { id },
- })
-}
-
-/**
- * 分账重试
- */
-export function retry(id) {
- return defHttp.post>({
- url: '/allocation/order/retry',
- params: { id },
- })
-}
-
-/**
- * 同步分账结果
- */
-export function sync(id) {
- return defHttp.post>({
- url: '/allocation/order/sync',
- params: { id },
- })
-}
-
-/**
- * 分账订单
- */
-export interface AllocOrder extends MchEntity {
- // 分账单号
- allocNo?: string
- // 商户分账单号
- bizAllocNo?: string
- // 通道分账号
- outAllocNo?: string
- // 支付订单ID
- orderId?: string
- // 支付订单号
- orderNo?: string
- // 商户支付订单号
- bizOrderNo?: string
- // 外部系统支付订单号
- outOrderNo?: string
- // 支付订单标题
- title?: string
- // 所属通道
- channel?: string
- // 总分账金额
- amount?: number
- // 分账描述
- description?: string
- // 状态
- status?: string
- // 处理结果
- result?: string
- // 完成时间
- finishTime?: string
- // 异步通知地址
- notifyUrl?: string
- // 商户扩展参数
- attach?: string
- // 附加参数
- extraParam?: string
- // 请求时间
- reqTime?: string
- // 支付终端ip
- clientIp?: string
- // 错误码
- errorCode?: string
- // 错误原因
- errorMsg?: string
-}
-
-/**
- * 分账订单明细
- */
-export interface AllocDetail extends MchEntity {
- // 分账订单ID
- allocationId?: string
- // 比例
- rate?: number
- // 金额
- amount?: number
- // 分账接收方类型
- receiverType?: string
- // 分账接收方Id
- receiverId?: string
- // 分账接收方名称
- name?: string
- // 接收方账号
- receiverAccount?: string
- // 接收方姓名
- receiverName?: string
- // 接收方编号
- receiverNo?: string
- // 分账结果
- result?: string
- // 错误代码
- errorCode?: string
- // 错误原因
- errorMsg?: string
- // 完成时间
- finishTime?: string
-}
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts b/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
deleted file mode 100644
index 49dfee16..00000000
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { PageResult, Result } from '#/axios'
-import { MchEntity } from '#/web'
-import { LabeledValue } from 'ant-design-vue/lib/select'
-
-/**
- * 分页
- */
-export function page(params) {
- return defHttp.get>>({
- url: '/allocation/receiver/page',
- params,
- })
-}
-
-/**
- * 查询详情
- */
-export function get(id) {
- return defHttp.get>({
- url: '/allocation/receiver/findById',
- params: { id },
- })
-}
-
-/**
- * 获取可以分账的通道
- */
-export function findChannels() {
- return defHttp.get>({
- url: '/allocation/receiver/findChannels',
- })
-}
-
-/**
- * 删除
- */
-export function del(id) {
- return defHttp.post>({
- url: '/allocation/receiver/delete',
- params: { id },
- })
-}
-
-/**
- * 分账接收方
- */
-export interface AllocReceiver extends MchEntity {
- // 分账接收方编号
- receiverNo?: string
- // 名称
- receiverName?: string
- // 所属通道
- channel?: string
- // 分账接收方类型
- receiverType?: string
- // 接收方账号
- receiverAccount?: string
-}
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
deleted file mode 100644
index 869d5e71..00000000
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
- 取消
- 下一步
-
-
-
-
-
diff --git a/src/views/daxpay/common/assist/basic/ChannelBasic.api.ts b/src/views/daxpay/common/assist/basic/ChannelBasic.api.ts
new file mode 100644
index 00000000..598a6d15
--- /dev/null
+++ b/src/views/daxpay/common/assist/basic/ChannelBasic.api.ts
@@ -0,0 +1,13 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { LabeledValue } from 'ant-design-vue/lib/select'
+
+/**
+ * 查询支付通道下属的支付方式列表
+ */
+export function payMethodList(channel: string) {
+ return defHttp.get>({
+ url: '/channel/basic/payMethodList',
+ params: { channel },
+ })
+}
diff --git a/src/views/daxpay/common/assist/basic/MchAppQuery.api.ts b/src/views/daxpay/common/assist/basic/MchAppQuery.api.ts
new file mode 100644
index 00000000..abb08860
--- /dev/null
+++ b/src/views/daxpay/common/assist/basic/MchAppQuery.api.ts
@@ -0,0 +1,41 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { LabeledValue } from 'ant-design-vue/lib/select'
+
+/**
+ * 查询应用下拉列表
+ */
+export function dropdown() {
+ return defHttp.get>({
+ url: '/mch/app/query/dropdown',
+ })
+}
+
+/**
+ * 查询启应用下拉列表
+ */
+export function dropdownByEnable() {
+ return defHttp.get>({
+ url: '/mch/app/query/dropdownByEnable',
+ })
+}
+
+/**
+ * 根据商户号查询应用下拉列表
+ */
+export function dropdownByMchNo(mchNo) {
+ return defHttp.get>({
+ url: '/mch/app/query/dropdownByMchNo',
+ params: { mchNo },
+ })
+}
+
+/**
+ * 根据商户号查询启应用下拉列表
+ */
+export function dropdownEnableByMchNo(mchNo) {
+ return defHttp.get>({
+ url: '/mch/app/query/dropdownEnableByMchNo',
+ params: { mchNo },
+ })
+}
diff --git a/src/views/daxpay/common/assist/basic/MerchantQuery.api.ts b/src/views/daxpay/common/assist/basic/MerchantQuery.api.ts
new file mode 100644
index 00000000..184ab5ef
--- /dev/null
+++ b/src/views/daxpay/common/assist/basic/MerchantQuery.api.ts
@@ -0,0 +1,20 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { LabeledValue } from 'ant-design-vue/lib/select'
+
+/**
+ * 商户下拉列表
+ */
+export function dropdown() {
+ return defHttp.get>({
+ url: '/merchant/query/dropdown',
+ })
+}
+/**
+ * 启用的商户下拉列表
+ */
+export function dropdownByEnable() {
+ return defHttp.get>({
+ url: '/merchant/query/dropdownByEnable',
+ })
+}
diff --git a/src/views/daxpay/common/channel/adapay/config/AdapayConfig.api.ts b/src/views/daxpay/common/channel/adapay/config/AdapayConfig.api.ts
new file mode 100644
index 00000000..56e477fe
--- /dev/null
+++ b/src/views/daxpay/common/channel/adapay/config/AdapayConfig.api.ts
@@ -0,0 +1,52 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get>({
+ url: '/adapay/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: AdaPayConfig) {
+ return defHttp.post({
+ url: '/adapay/config/saveOrUpdate',
+ data: obj,
+ })
+}
+
+/**
+ * 汇付支付配置
+ */
+export interface AdaPayConfig extends MchEntity {
+ // 汇付商户号
+ adaPayMchNo?: string
+ // 汇付应用号
+ adaPayAppId?: string
+ // API_KEY
+ apiKey?: string
+ // 商户RSA私钥
+ mchPrivateKey?: string
+ // 汇付RSA公钥
+ adaPayPublicKey?: string
+ // 是否启用
+ enable: boolean
+ // 是否沙箱环境
+ sandbox?: boolean
+ // 分账类型
+ allocType?: string
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
diff --git a/src/views/daxpay/common/channel/adapay/config/AdapayConfigEdit.vue b/src/views/daxpay/common/channel/adapay/config/AdapayConfigEdit.vue
new file mode 100644
index 00000000..deb3ae85
--- /dev/null
+++ b/src/views/daxpay/common/channel/adapay/config/AdapayConfigEdit.vue
@@ -0,0 +1,203 @@
+
+
+
+
+ 子商户配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 微信认证配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/adapay/terminal/AdapayTerminal.api.ts b/src/views/daxpay/common/channel/adapay/terminal/AdapayTerminal.api.ts
new file mode 100644
index 00000000..873b9c5c
--- /dev/null
+++ b/src/views/daxpay/common/channel/adapay/terminal/AdapayTerminal.api.ts
@@ -0,0 +1,31 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { ChannelTerminal } from '@/views/daxpay/common/device/terminal/channel/ChannelTerminal.api'
+
+/**
+ * 获取
+ */
+export function get(id) {
+ return defHttp.get>({
+ url: '/adapay/terminal/findById',
+ params: { id },
+ })
+}
+
+/**
+ * 更新
+ */
+export function update(params) {
+ return defHttp.post>({
+ url: '/adapay/terminal/update',
+ data: params,
+ })
+}
+
+/**
+ * 通道终端设备上报记录
+ */
+export interface AdaPayTerminal extends ChannelTerminal {
+ /** 费率类型 */
+ feeType?: string
+}
diff --git a/src/views/daxpay/common/channel/adapay/terminal/AdapayTerminalEdit.vue b/src/views/daxpay/common/channel/adapay/terminal/AdapayTerminalEdit.vue
new file mode 100644
index 00000000..f38f3e2b
--- /dev/null
+++ b/src/views/daxpay/common/channel/adapay/terminal/AdapayTerminalEdit.vue
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+ {{ dictConvert('channel', form.channel) }}
+
+
+
+
+
+
+
+ 标准费率线上
+ 标准费率线下
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/alipay/config/isv/AlipayIsvConfig.api.ts b/src/views/daxpay/common/channel/alipay/config/isv/AlipayIsvConfig.api.ts
new file mode 100644
index 00000000..9f5dc06f
--- /dev/null
+++ b/src/views/daxpay/common/channel/alipay/config/isv/AlipayIsvConfig.api.ts
@@ -0,0 +1,60 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get>({
+ url: '/isv/alipay/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: AlipayConfig) {
+ return defHttp.post({
+ url: '/isv/alipay/config/saveOrUpdate',
+ data: obj,
+ })
+}
+
+/**
+ * 支付宝配置
+ */
+export interface AlipayConfig extends MchEntity {
+ // 支付宝商户appId
+ aliAppId?: string
+ // 是否启用
+ enable: boolean
+ // 商户账号ID
+ alipayUserId?: string
+ // 授权回调地址
+ redirectUrl?: string
+ // 服务器异步通知页面路径
+ notifyUrl?: string
+ // 页面跳转同步通知页面路径
+ returnUrl?: string
+ // 认证方式
+ authType?: string
+ // 签名类型
+ signType?: string
+ // 支付宝公钥
+ alipayPublicKey?: string
+ // 应用私钥
+ privateKey?: string
+ // 应用公钥
+ appCert?: string
+ // 支付宝公钥证书
+ alipayCert?: string
+ // 支付宝CA根证书
+ alipayRootCert?: string
+ // 是否沙箱环境
+ sandbox?: boolean
+ // 服务商号
+ isvNo?: string
+}
diff --git a/src/views/daxpay/common/channel/alipay/config/isv/AlipayIsvConfigEdit.vue b/src/views/daxpay/common/channel/alipay/config/isv/AlipayIsvConfigEdit.vue
new file mode 100644
index 00000000..1b60cc4f
--- /dev/null
+++ b/src/views/daxpay/common/channel/alipay/config/isv/AlipayIsvConfigEdit.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 公钥模式
+ 证书模式
+
+
+
+
+ RSA2秘钥
+
+
+
+
+
+
+
+
+ 应用证书上传
+
+
+
+
+ 删除上传的证书文件
+
+
+
+
+
+
+ 公钥证书上传
+
+
+
+
+ 删除上传的证书文件
+
+
+
+
+
+
+ CA根证书上传
+
+
+
+
+ 删除上传的证书文件
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/alipay/config/payment/AlipaySubConfigEdit.vue b/src/views/daxpay/common/channel/alipay/config/payment/AlipaySubConfigEdit.vue
new file mode 100644
index 00000000..65d89f62
--- /dev/null
+++ b/src/views/daxpay/common/channel/alipay/config/payment/AlipaySubConfigEdit.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/alipay/receiver/AlipayAllocReceiver.api.ts b/src/views/daxpay/common/channel/alipay/receiver/AlipayAllocReceiver.api.ts
deleted file mode 100644
index b203fafb..00000000
--- a/src/views/daxpay/common/channel/alipay/receiver/AlipayAllocReceiver.api.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { Result } from '#/axios'
-import { MchEntity } from '#/web'
-
-/**
- * 详情
- * @param id
- */
-export function get(id) {
- return defHttp.get>({
- url: '/alipay/allocation/receiver/findById',
- params: { id },
- })
-}
-/**
- * 新增或更新
- */
-export function saveOrUpdate(data) {
- return defHttp.post>({
- url: '/alipay/allocation/receiver/saveOrUpdate',
- data,
- })
-}
-
-/**
- * 支付宝分账接收方
- */
-export interface AlipayAllocReceiver extends MchEntity {
- // 分账接收方编号
- receiverNo?: string
- // 接收方名称
- receiverName?: string
- // 接收方类型
- receiverType?: string
- // 接收方账号
- receiverAccount?: string
- // 分账关系类型
- relationType?: string
- // 分账关系名称
- relationName?: string
-}
diff --git a/src/views/daxpay/common/channel/alipay/receiver/AlipayAllocReceiverEdit.vue b/src/views/daxpay/common/channel/alipay/receiver/AlipayAllocReceiverEdit.vue
deleted file mode 100644
index 0cabd516..00000000
--- a/src/views/daxpay/common/channel/alipay/receiver/AlipayAllocReceiverEdit.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 保存
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBind.api.ts b/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBind.api.ts
deleted file mode 100644
index 530b82cb..00000000
--- a/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBind.api.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { PageResult, Result } from '#/axios'
-import { MchEntity } from '#/web'
-
-/**
- * 分页查询
- */
-export function page(params) {
- return defHttp.get>>({
- url: '/alipay/allocation/receiver/bind/page',
- params,
- })
-}
-
-/**
- * 查询
- */
-export function get(id) {
- return defHttp.get>({
- url: '/alipay/allocation/receiver/bind/findById',
- params: { id },
- })
-}
-/**
- * 创建
- */
-export function add(data) {
- return defHttp.post>({
- url: '/alipay/allocation/receiver/bind/add',
- data,
- })
-}
-/**
- * 更新
- */
-export function update(data) {
- return defHttp.post>({
- url: '/alipay/allocation/receiver/bind/update',
- data,
- })
-}
-
-/**
- * 绑定
- */
-export function bind(id) {
- return defHttp.post>({
- url: '/alipay/allocation/receiver/bind/bind',
- params: { id },
- })
-}
-
-/**
- * 解绑
- */
-export function unbind(id) {
- return defHttp.post>({
- url: '/alipay/allocation/receiver/bind/unbind',
- params: { id },
- })
-}
-/**
- * 删除
- */
-export function del(id) {
- return defHttp.post>({
- url: '/alipay/allocation/receiver/bind/remove',
- params: { id },
- })
-}
-
-/**
- * 支付宝分账接收方绑定
- */
-export interface AlipayReceiverBind extends MchEntity {
- // 接收方类型
- receiverType?: string
- // receiverAccount
- receiverAccount?: string
- // 接收方名称
- receiverName?: string
- // 分账关系类型
- relationType?: string
- // 分账关系名称
- relationName?: string
- // 是否服务商模式
- isv?: boolean
- // 是否绑定
- bind?: boolean
- // 错误提示
- errorMsg?: string
-}
diff --git a/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBindEdit.vue b/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBindEdit.vue
deleted file mode 100644
index 87e84689..00000000
--- a/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBindEdit.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-
-
-
-
-
-
-
-
- 直联
- 服务商
-
-
-
- {{ form.appName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 保存
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBindList.vue b/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBindList.vue
deleted file mode 100644
index 1de926f2..00000000
--- a/src/views/daxpay/common/channel/alipay/receiver/bind/AlipayReceiverBindList.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-
- >({
+ url: '/isv/hkrt/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: HkrtIsvConfig) {
+ return defHttp.post({
+ url: '/isv/hkrt/config/saveOrUpdate',
+ data: obj,
+ })
+}
+
+/**
+ * 海科服务商配置
+ */
+export interface HkrtIsvConfig extends MchEntity {
+ // 服务商编号
+ agentNo?: string
+ // 接入机构标识
+ accessId?: string
+ // 是否启用
+ enable: boolean
+ // 交易KEY
+ tradeKey?: string
+ // 密钥
+ accessKey?: string
+ // 微信渠道号
+ wxChannelNo?: string
+ // 支付宝渠道号
+ aliChannelNo?: string
+ // 传输密钥
+ transferKey?: string
+ // 是否沙箱环境
+ sandbox?: boolean
+ // 交易API地址
+ tradeUrl?: string
+ // 其他API地址
+ otherUrl?: string
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+ // 服务商号
+ isvNo?: string
+}
diff --git a/src/views/daxpay/common/channel/hkrt/config/isv/HkrtIsvConfigEdit.vue b/src/views/daxpay/common/channel/hkrt/config/isv/HkrtIsvConfigEdit.vue
new file mode 100644
index 00000000..c9d50d6b
--- /dev/null
+++ b/src/views/daxpay/common/channel/hkrt/config/isv/HkrtIsvConfigEdit.vue
@@ -0,0 +1,200 @@
+
+
+
+
+ 基础配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 微信认证配置
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/hkrt/config/payment/HkrtPayConfig.api.ts b/src/views/daxpay/common/channel/hkrt/config/payment/HkrtPayConfig.api.ts
new file mode 100644
index 00000000..535c2cc4
--- /dev/null
+++ b/src/views/daxpay/common/channel/hkrt/config/payment/HkrtPayConfig.api.ts
@@ -0,0 +1,97 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get>({
+ url: '/hkrt/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: HkrtPayConfig) {
+ return defHttp.post({
+ url: '/hkrt/config/saveOrUpdate',
+ data: obj,
+ })
+}
+/**
+ * 获取单条特约商户
+ */
+export function getSubConfig(id) {
+ return defHttp.get>({
+ url: '/hkrt/config/findSubById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新特约商户
+ */
+export function saveOrUpdateSub(obj: HkrtSubConfig) {
+ return defHttp.post({
+ url: '/hkrt/config/saveOrUpdateSub',
+ data: obj,
+ })
+}
+
+/**
+ * 海科支付配置
+ */
+export interface HkrtPayConfig extends MchEntity {
+ // 商户编号
+ merchNo?: string
+ // 服务商编号
+ agentNo?: string
+ // 接入机构标识
+ accessId?: string
+ // SAAS终端号
+ pn?: string
+ // 是否启用
+ enable: boolean
+ // 密钥
+ accessKey?: string
+ // 传输密钥
+ transferKey?: string
+ // 是否沙箱环境
+ sandbox?: boolean
+ // 交易API地址
+ tradeUrl?: string
+ // 其他API地址
+ otherUrl?: string
+ // 是否使用海通官方获取OpenId方式
+ wxOpenIdUseHkrt?: boolean
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
+
+/**
+ * 子商户服务商配置
+ */
+export interface HkrtSubConfig extends MchEntity {
+ // 商户编号
+ merchNo?: string
+ // SAAS终端号
+ pn?: string
+ // 是否启用
+ enable: boolean
+ // 读取服务商配置
+ readSystem?: boolean
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
diff --git a/src/views/daxpay/common/channel/hkrt/config/payment/HkrtPayConfigEdit.vue b/src/views/daxpay/common/channel/hkrt/config/payment/HkrtPayConfigEdit.vue
new file mode 100644
index 00000000..c8cbfb27
--- /dev/null
+++ b/src/views/daxpay/common/channel/hkrt/config/payment/HkrtPayConfigEdit.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/hkrt/config/payment/HkrtSubConfigEdit.vue b/src/views/daxpay/common/channel/hkrt/config/payment/HkrtSubConfigEdit.vue
new file mode 100644
index 00000000..4d7f02e9
--- /dev/null
+++ b/src/views/daxpay/common/channel/hkrt/config/payment/HkrtSubConfigEdit.vue
@@ -0,0 +1,191 @@
+
+
+
+
+ 子商户配置
+
+
+
+
+
+
+
+
+ 微信认证配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/hkrt/terminal/HkrtTerminal.api.ts b/src/views/daxpay/common/channel/hkrt/terminal/HkrtTerminal.api.ts
new file mode 100644
index 00000000..6dd28713
--- /dev/null
+++ b/src/views/daxpay/common/channel/hkrt/terminal/HkrtTerminal.api.ts
@@ -0,0 +1,37 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { ChannelTerminal } from '@/views/daxpay/common/device/terminal/channel/ChannelTerminal.api'
+
+/**
+ * 获取
+ */
+export function get(id) {
+ return defHttp.get>({
+ url: '/hkrt/terminal/findById',
+ params: { id },
+ })
+}
+
+/**
+ * 更新
+ */
+export function update(params) {
+ return defHttp.post>({
+ url: '/hkrt/terminal/update',
+ data: params,
+ })
+}
+
+/**
+ * 通道终端设备上报记录
+ */
+export interface HkrtTerminal extends ChannelTerminal {
+ /** 终端型号代码 */
+ code?: string
+ /** 门店编号 */
+ storeId?: string
+ /** 海科系统序列号 */
+ pn?: string
+ /** 地址 */
+ address?: string
+}
diff --git a/src/views/daxpay/common/channel/hkrt/terminal/HkrtTerminalEdit.vue b/src/views/daxpay/common/channel/hkrt/terminal/HkrtTerminalEdit.vue
new file mode 100644
index 00000000..9115684b
--- /dev/null
+++ b/src/views/daxpay/common/channel/hkrt/terminal/HkrtTerminalEdit.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+ {{ dictConvert('channel', form.channel) }}
+
+
+
+
+
+
+
+ 条码支付辅助受理终端
+ 联迪A8
+ 商米p2
+ 商米p1
+ 华智融NEW9220
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/leshua/config/isv/LeshuaIsvConfig.api.ts b/src/views/daxpay/common/channel/leshua/config/isv/LeshuaIsvConfig.api.ts
new file mode 100644
index 00000000..fee81db8
--- /dev/null
+++ b/src/views/daxpay/common/channel/leshua/config/isv/LeshuaIsvConfig.api.ts
@@ -0,0 +1,50 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get>({
+ url: '/isv/leshua/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: LeshuaIsvConfig) {
+ return defHttp.post({
+ url: '/isv/leshua/config/saveOrUpdate',
+ data: obj,
+ })
+}
+
+/**
+ * 乐刷服务商配置
+ */
+export interface LeshuaIsvConfig extends MchEntity {
+ // 乐刷服务商
+ lsIsvNo?: string
+ // 是否启用
+ enable: boolean
+ // 交易KEY
+ tradeKey?: string
+ // 异步通知key
+ notifyKey?: string
+ // 认证方式
+ authType?: string
+ // 签名类型
+ signType?: string
+ // 是否沙箱环境
+ sandbox?: boolean
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
diff --git a/src/views/daxpay/common/channel/leshua/config/isv/LeshuaIsvConfigEdit.vue b/src/views/daxpay/common/channel/leshua/config/isv/LeshuaIsvConfigEdit.vue
new file mode 100644
index 00000000..8766866a
--- /dev/null
+++ b/src/views/daxpay/common/channel/leshua/config/isv/LeshuaIsvConfigEdit.vue
@@ -0,0 +1,191 @@
+
+
+
+
+ 基础配置
+
+
+
+
+
+
+
+
+
+
+ MD5
+ SM3
+
+
+
+
+
+
+ 微信认证配置
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/leshua/config/payment/LeshuaConfig.api.ts b/src/views/daxpay/common/channel/leshua/config/payment/LeshuaConfig.api.ts
new file mode 100644
index 00000000..999f9102
--- /dev/null
+++ b/src/views/daxpay/common/channel/leshua/config/payment/LeshuaConfig.api.ts
@@ -0,0 +1,94 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get>({
+ url: '/leshua/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: LeshuaPayConfig) {
+ return defHttp.post({
+ url: '/leshua/config/saveOrUpdate',
+ data: obj,
+ })
+}
+
+/**
+ * 获取单条特约商户
+ */
+export function getSubConfig(id) {
+ return defHttp.get>({
+ url: '/leshua/config/findSubById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新特约商户
+ */
+export function saveOrUpdateSub(obj: LeshuaSubConfig) {
+ return defHttp.post({
+ url: '/leshua/config/saveOrUpdateSub',
+ data: obj,
+ })
+}
+
+/**
+ * 乐刷支付配置
+ */
+export interface LeshuaPayConfig extends MchEntity {
+ // 乐刷商户号
+ lsMchNo?: string
+ // 乐刷服务商号
+ lsIsvNo?: string
+ // 是否启用
+ enable: boolean
+ // 支付限额
+ limitAmount?: number
+ // 交易KEY
+ tradeKey?: string
+ // 异步通知key
+ notifyKey?: string
+ // 认证方式
+ authType?: string
+ // 签名类型
+ signType?: string
+ // 是否沙箱环境
+ sandbox?: boolean
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
+
+/**
+ * 子商户服务商配置
+ */
+export interface LeshuaSubConfig extends MchEntity {
+ // 服务商号
+ isvNo?: string
+ // 乐刷商户号
+ lsMchNo?: string
+ // 是否启用
+ enable: boolean
+ // 读取服务商配置
+ readSystem?: boolean
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
diff --git a/src/views/daxpay/common/channel/leshua/config/payment/LeshuaConfigEdit.vue b/src/views/daxpay/common/channel/leshua/config/payment/LeshuaConfigEdit.vue
new file mode 100644
index 00000000..2cbd61f1
--- /dev/null
+++ b/src/views/daxpay/common/channel/leshua/config/payment/LeshuaConfigEdit.vue
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MD5
+ SM3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/leshua/config/payment/LeshuaSubConfigEdit.vue b/src/views/daxpay/common/channel/leshua/config/payment/LeshuaSubConfigEdit.vue
new file mode 100644
index 00000000..4aa9d702
--- /dev/null
+++ b/src/views/daxpay/common/channel/leshua/config/payment/LeshuaSubConfigEdit.vue
@@ -0,0 +1,187 @@
+
+
+
+
+ 子商户配置
+
+
+
+
+
+
+ 微信认证配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/leshua/terminal/LeshuaTerminal.api.ts b/src/views/daxpay/common/channel/leshua/terminal/LeshuaTerminal.api.ts
new file mode 100644
index 00000000..fc9dc488
--- /dev/null
+++ b/src/views/daxpay/common/channel/leshua/terminal/LeshuaTerminal.api.ts
@@ -0,0 +1,39 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { ChannelTerminal } from '@/views/daxpay/common/device/terminal/channel/ChannelTerminal.api'
+
+/**
+ * 获取
+ */
+export function get(id) {
+ return defHttp.get>({
+ url: '/leshua/terminal/findById',
+ params: { id },
+ })
+}
+
+/**
+ * 更新
+ */
+export function update(params) {
+ return defHttp.post>({
+ url: '/leshua/terminal/update',
+ data: params,
+ })
+}
+
+/**
+ * 通道终端设备上报记录
+ */
+export interface LeshuaTerminal extends ChannelTerminal {
+ /** 新设备类型 */
+ newTerminalType?: string
+ /** 终端厂商名称 */
+ industryName?: string
+ /** 终端型号 */
+ industryModel?: string
+ /** 乐刷终端编号 */
+ deviceId?: string
+ /** 终端序列号 */
+ serialNum?: string
+}
diff --git a/src/views/daxpay/common/channel/leshua/terminal/LeshuaTerminalEdit.vue b/src/views/daxpay/common/channel/leshua/terminal/LeshuaTerminalEdit.vue
new file mode 100644
index 00000000..f1c8e84e
--- /dev/null
+++ b/src/views/daxpay/common/channel/leshua/terminal/LeshuaTerminalEdit.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+ {{ dictConvert('channel', form.channel) }}
+
+
+
+
+
+
+
+ POS
+ MIS
+ ATM/CDM
+ II型电话支付终端（商用型）
+ 自定义
+ 智能POS
+ mPOS
+ 人脸识别终端
+ 条码支付辅助终端
+ 条码支付受理终端
+ 行业终端
+ 云闪付终端
+ 手机POS
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/vbill/config/isv/VbillIsvConfigEdit.vue b/src/views/daxpay/common/channel/vbill/config/isv/VbillIsvConfigEdit.vue
new file mode 100644
index 00000000..cedace15
--- /dev/null
+++ b/src/views/daxpay/common/channel/vbill/config/isv/VbillIsvConfigEdit.vue
@@ -0,0 +1,178 @@
+
+
+
+
+ 基础配置
+
+
+
+
+
+
+
+
+
+
+
+
+ 微信认证配置
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/vbill/config/isv/VbillsvConfig.api.ts b/src/views/daxpay/common/channel/vbill/config/isv/VbillsvConfig.api.ts
new file mode 100644
index 00000000..fa94169e
--- /dev/null
+++ b/src/views/daxpay/common/channel/vbill/config/isv/VbillsvConfig.api.ts
@@ -0,0 +1,48 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get>({
+ url: '/isv/vbill/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: VbillIsvConfig) {
+ return defHttp.post({
+ url: '/isv/vbill/config/saveOrUpdate',
+ data: obj,
+ })
+}
+
+/**
+ * 随行付服务商配置
+ */
+export interface VbillIsvConfig extends MchEntity {
+ // 天阙机构id
+ orgId?: string
+ // 是否启用
+ enable: boolean
+ // 沙箱
+ sandbox: boolean
+ // 支付限额
+ limitAmount?: number
+ // 天阙公钥
+ publicKey?: string
+ // 私钥
+ privateKey?: string
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
diff --git a/src/views/daxpay/common/channel/vbill/config/payment/VbillConfig.api.ts b/src/views/daxpay/common/channel/vbill/config/payment/VbillConfig.api.ts
new file mode 100644
index 00000000..37ff0405
--- /dev/null
+++ b/src/views/daxpay/common/channel/vbill/config/payment/VbillConfig.api.ts
@@ -0,0 +1,92 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get>({
+ url: '/vbill/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: VbillPayConfig) {
+ return defHttp.post({
+ url: '/vbill/config/saveOrUpdate',
+ data: obj,
+ })
+}
+
+/**
+ * 获取单条特约商户
+ */
+export function getSubConfig(id) {
+ return defHttp.get>({
+ url: '/vbill/config/findSubById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新特约商户
+ */
+export function saveOrUpdateSub(obj: VbillSubConfig) {
+ return defHttp.post({
+ url: '/vbill/config/saveOrUpdateSub',
+ data: obj,
+ })
+}
+
+/**
+ * 随行付支付配置
+ */
+export interface VbillPayConfig extends MchEntity {
+ // 天阙商户号
+ mno?: string
+ // 天阙机构号
+ orgId?: string
+ // 是否启用
+ enable: boolean
+ // 支付限额
+ limitAmount?: number
+ // 天阙公钥
+ publicKey?: string
+ // 私钥
+ privateKey?: string
+ // 是否沙箱环境
+ sandbox?: boolean
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
+
+/**
+ * 子商户服务商配置
+ */
+export interface VbillSubConfig extends MchEntity {
+ // 服务商号
+ isvNo?: string
+ // 随行付商户号
+ mno?: string
+ // 是否启用
+ enable: boolean
+ // 支付限额
+ limitAmount?: number
+ // 读取服务商配置
+ readSystem?: boolean
+ // 微信AppId
+ wxAppId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
+}
diff --git a/src/views/daxpay/common/channel/vbill/config/payment/VbillConfigEdit.vue b/src/views/daxpay/common/channel/vbill/config/payment/VbillConfigEdit.vue
new file mode 100644
index 00000000..fdeebf70
--- /dev/null
+++ b/src/views/daxpay/common/channel/vbill/config/payment/VbillConfigEdit.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/vbill/config/payment/VbillSubConfigEdit.vue b/src/views/daxpay/common/channel/vbill/config/payment/VbillSubConfigEdit.vue
new file mode 100644
index 00000000..a9f2d2a3
--- /dev/null
+++ b/src/views/daxpay/common/channel/vbill/config/payment/VbillSubConfigEdit.vue
@@ -0,0 +1,186 @@
+
+
+
+
+ 子商户配置
+
+
+
+
+
+
+ 微信认证配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/vbill/terminal/VbillTerminal.api.ts b/src/views/daxpay/common/channel/vbill/terminal/VbillTerminal.api.ts
new file mode 100644
index 00000000..24dc60f2
--- /dev/null
+++ b/src/views/daxpay/common/channel/vbill/terminal/VbillTerminal.api.ts
@@ -0,0 +1,43 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { ChannelTerminal } from '@/views/daxpay/common/device/terminal/channel/ChannelTerminal.api'
+
+/**
+ * 获取
+ */
+export function get(id) {
+ return defHttp.get>({
+ url: '/vbill/terminal/findById',
+ params: { id },
+ })
+}
+
+/**
+ * 更新
+ */
+export function update(params) {
+ return defHttp.post>({
+ url: '/vbill/terminal/update',
+ data: params,
+ })
+}
+
+/**
+ * 通道终端设备上报记录
+ */
+export interface VbillTerminal extends ChannelTerminal {
+ /** 门店编号 */
+ storeId?: string
+ /** 设备别名 */
+ devicesName?: string
+ /** 设备归属 0 第三方终端 1 天阙入网终端 */
+ belongTo?: string
+ /** 设备型号 */
+ modelNo?: string
+ /** 设备SN 非TH型号必传（传完整的TUSN） */
+ serialNo?: string
+ /** 终端号 */
+ deviceNo?: string
+ /** 银联活动终端号 */
+ ylTrmNo?: string
+}
diff --git a/src/views/daxpay/common/channel/vbill/terminal/VbillTerminalEdit.vue b/src/views/daxpay/common/channel/vbill/terminal/VbillTerminalEdit.vue
new file mode 100644
index 00000000..5cc77f5a
--- /dev/null
+++ b/src/views/daxpay/common/channel/vbill/terminal/VbillTerminalEdit.vue
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+ {{ dictConvert('channel', form.channel) }}
+
+
+
+
+
+
+
+
+
+
+
+ 第三方终端
+ 天阙入网终端
+
+
+
+
+ QR68(百富)
+ QM50(联迪)
+ QR68S(百富)
+ T1(蚂里奥)
+ 支付宝盒F6
+ 蜻蜓F1
+ 商米蜻蜓
+ 支付宝盒商米聚合版
+ 支付宝盒F4plus
+ 支付宝盒F4H
+ 支付宝盒F4
+ S03(升腾)
+ KS8303(证通)
+ CG05(博实)
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/wechat/config/isv/WechatIsvConfig.api.ts b/src/views/daxpay/common/channel/wechat/config/isv/WechatIsvConfig.api.ts
new file mode 100644
index 00000000..e1507ea6
--- /dev/null
+++ b/src/views/daxpay/common/channel/wechat/config/isv/WechatIsvConfig.api.ts
@@ -0,0 +1,67 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get>({
+ url: '/isv/wechat/config/findById',
+ params: { id: unref(id) },
+ })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: WechatPayConfig) {
+ return defHttp.post({
+ url: '/isv/wechat/config/saveOrUpdate',
+ data: obj,
+ })
+}
+
+/**
+ * 微信支付配置
+ */
+export interface WechatPayConfig extends MchEntity {
+ // 微信应用AppId
+ wxAppId?: string
+ // 微信商户号
+ wxMchId?: string
+ // 是否启用
+ enable: boolean
+ // API 版本
+ apiVersion: string
+ // 商户平台「API安全」中的 APIv2 密钥
+ apiKeyV2?: string
+ // 商户平台「API安全」中的 APIv3 密钥
+ apiKeyV3?: string
+ // APPID对应的接口密码，用于获取接口调用凭证access_token时使用
+ appSecret?: string
+ // 支付公钥
+ publicKey?: string
+ // 支付公钥ID
+ publicKeyId?: string
+ // 私钥Key
+ privateKey?: string
+ // 私钥证书
+ privateCert?: string
+ // 证书序列号
+ certSerialNo?: string
+ // p12的文件id
+ p12?: string | null
+ // 应用域名，回调中会使用此参数
+ domain?: string
+ // 授权回调地址
+ redirectUrl?: string
+ // 服务器异步通知页面路径
+ notifyUrl?: string
+ // 页面跳转同步通知页面路径
+ returnUrl?: string
+ // 微信授权认证地址
+ authUrl?: string
+ // 服务商号
+ isvNo?: string
+}
diff --git a/src/views/daxpay/common/channel/wechat/config/isv/WechatIsvConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/isv/WechatIsvConfigEdit.vue
new file mode 100644
index 00000000..ff59505c
--- /dev/null
+++ b/src/views/daxpay/common/channel/wechat/config/isv/WechatIsvConfigEdit.vue
@@ -0,0 +1,377 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ API_V2
+ API_V3
+
+
+
+
+
+
+
+
+ API证书上传
+
+
+
+
+ 删除上传的商户API证书
+
+
+
+
+
+
+ API证书私钥上传
+
+
+
+
+ 删除上传的API证书私钥
+
+
+
+
+
+
+
+
+ 支付公钥上传
+
+
+
+
+ 删除上传的支付公钥
+
+
+
+
+
+
+
+
+ p12证书上传
+
+
+
+
+ 删除上传的证书文件
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfig.api.ts b/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfig.api.ts
index aaaccea5..da03bbc2 100644
--- a/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfig.api.ts
+++ b/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfig.api.ts
@@ -99,14 +99,16 @@ export interface WechatPayConfig extends MchEntity {
* 特约商户服务商配置
*/
export interface WechatPaySubConfig extends MchEntity {
- // 服务商号
- isvNo?: string
+ // 子商户商户号
+ subMchId?: string
// 授权类型
authType?: string
// 子商户应用AppId
subAppId?: string
- // 子商户商户号
- subMchId?: string
+ // 微信AppSecret
+ wxAppSecret?: string
+ // 微信授权认证地址
+ wxAuthUrl?: string
// 是否启用
enable?: boolean
// 支付限额
diff --git a/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfigEdit.vue
index 1aee5b68..61bbd557 100644
--- a/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/wechat/config/payment/WechatPayConfigEdit.vue
@@ -58,14 +58,11 @@
placeholder="用于获取接口调用凭证时使用, 如OpenId/AccessToken等"
/>
-
-
-
- OAuth2认证地址
-
-
+
-
-
-
- 商户API证书
-
-
+
API证书上传
@@ -132,20 +128,19 @@
-
-
-
- 商户API证书私钥
-
-
+
API证书私钥上传
@@ -170,18 +165,15 @@
placeholder="请输入商户API证书序列号"
/>
-
-
- 支付公钥
-
+
支付公钥上传
@@ -206,20 +198,19 @@
placeholder="请输入支付公钥ID"
/>
-
-
-
- p12证书
-
-
+
p12证书上传
@@ -257,16 +248,13 @@
import { getConfig, saveOrUpdate, WechatPayConfig } from './WechatPayConfig.api'
import { FormInstance, Rule } from 'ant-design-vue/lib/form'
import { BasicDrawer } from '@/components/Drawer'
- import Icon from '../../../../../../../components/Icon/Icon.vue'
- import { useUpload } from '@/hooks/bootx/useUpload'
+ import Icon from '@/components/Icon/Icon.vue'
import { useMessage } from '@/hooks/web/useMessage'
- import BasicTitle from '@/components/Basic/src/BasicTitle.vue'
import { ChannelConfig } from '@/views/daxpay/common/merchant/config/ChannelConfig.api'
const { handleCancel, diffForm, labelCol, wrapperCol, confirmLoading, visible, showable } =
useFormEdit()
// 文件上传
- const { tokenHeader, uploadAction } = useUpload('/readBase64')
const { createMessage } = useMessage()
const isIsv = ref(false)
@@ -278,7 +266,7 @@
enable: true,
limitAmount: 20000,
apiVersion: 'apiV2',
- authType: 'isv',
+ authType: 'sp',
})
const channelConfig = ref({})
@@ -354,10 +342,11 @@
'privateCert',
'privateKey',
'certSerialNo',
- 'publicKey',
'publicKeyId',
+ 'publicKey',
),
isv: isIsv.value,
+ mchNo: channelConfig.value.mchNo,
appId: channelConfig.value.appId,
})
.then(() => {
@@ -377,22 +366,27 @@
formRef.value?.resetFields()
})
}
+ /**
+ * 阻止自动上传
+ */
+ function beforeUpload() {
+ // 返回 false 可以阻止自动上传
+ return false
+ }
/**
* 文件上传
*/
function handleChange(info, fieldName) {
- // 上传完毕
- if (info.file.status === 'done') {
- const res = info.file.response
- if (!res.code) {
- form.value[fieldName] = res.data
- createMessage.success(`${info.file.name} 上传成功!`)
- } else {
- createMessage.error(`${res.msg}`)
- }
- } else if (info.file.status === 'error') {
- createMessage.error('上传失败')
+ const file = info.file
+ const reader = new FileReader()
+ reader.onload = () => {
+ // 读取结果
+ form.value[fieldName] = (reader.result as string)?.split(',')[1]
+ createMessage.success(`${info.file.name} 上传成功!`)
+ formRef.value?.validateFields(fieldName)
}
+ // 读取文件为base64文本
+ reader.readAsDataURL(file)
}
defineExpose({
init,
diff --git a/src/views/daxpay/common/channel/wechat/config/payment/WechatSubConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/payment/WechatSubConfigEdit.vue
new file mode 100644
index 00000000..84dd98e6
--- /dev/null
+++ b/src/views/daxpay/common/channel/wechat/config/payment/WechatSubConfigEdit.vue
@@ -0,0 +1,187 @@
+
+
+
+
+ 子商户配置
+
+
+
+
+
+
+ 授权认证配置
+
+
+ 服务商用户标识
+ 子商户应用用户标识
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/channel/wechat/receiver/WechatAllocReceiver.api.ts b/src/views/daxpay/common/channel/wechat/receiver/WechatAllocReceiver.api.ts
deleted file mode 100644
index 89592d55..00000000
--- a/src/views/daxpay/common/channel/wechat/receiver/WechatAllocReceiver.api.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { Result } from '#/axios'
-import { MchEntity } from '#/web'
-
-/**
- * 详情
- * @param id
- */
-export function get(id) {
- return defHttp.get>({
- url: '/wechat/allocation/receiver/findById',
- params: { id },
- })
-}
-/**
- * 新增或更新
- */
-export function saveOrUpdate(data) {
- return defHttp.post>({
- url: '/wechat/allocation/receiver/saveOrUpdate',
- data,
- })
-}
-
-/**
- * 乐刷分账能力开通
- */
-export interface WechatAllocReceiver extends MchEntity {
- // 分账接收方编号
- receiverNo?: string
- // 接收方名称
- receiverName?: string
- // 接收方类型
- receiverType?: string
- // 接收方账号
- receiverAccount?: string
- // 分账关系类型
- relationType?: string
- // 分账关系名称
- relationName?: string
-}
diff --git a/src/views/daxpay/common/channel/wechat/receiver/WechatAllocReceiverEdit.vue b/src/views/daxpay/common/channel/wechat/receiver/WechatAllocReceiverEdit.vue
deleted file mode 100644
index ddf5b55d..00000000
--- a/src/views/daxpay/common/channel/wechat/receiver/WechatAllocReceiverEdit.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 保存
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBind.api.ts b/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBind.api.ts
deleted file mode 100644
index ef4116d9..00000000
--- a/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBind.api.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { PageResult, Result } from '#/axios'
-import { MchEntity } from '#/web'
-
-/**
- * 分页查询
- */
-export function page(params) {
- return defHttp.get>>({
- url: '/wechat/allocation/receiver/bind/page',
- params,
- })
-}
-
-/**
- * 查询
- */
-export function get(id) {
- return defHttp.get>({
- url: '/wechat/allocation/receiver/bind/findById',
- params: { id },
- })
-}
-/**
- * 创建
- */
-export function add(data) {
- return defHttp.post>({
- url: '/wechat/allocation/receiver/bind/add',
- data,
- })
-}
-/**
- * 更新
- */
-export function update(data) {
- return defHttp.post>({
- url: '/wechat/allocation/receiver/bind/update',
- data,
- })
-}
-
-/**
- * 绑定
- */
-export function bind(id) {
- return defHttp.post>({
- url: '/wechat/allocation/receiver/bind/bind',
- params: { id },
- })
-}
-
-/**
- * 解绑
- */
-export function unbind(id) {
- return defHttp.post>({
- url: '/wechat/allocation/receiver/bind/unbind',
- params: { id },
- })
-}
-/**
- * 删除
- */
-export function del(id) {
- return defHttp.post>({
- url: '/wechat/allocation/receiver/bind/remove',
- params: { id },
- })
-}
-
-/**
- * 支付宝分账接收方绑定
- */
-export interface WechatReceiverBind extends MchEntity {
- // 接收方类型
- receiverType?: string
- // receiverAccount
- receiverAccount?: string
- // 接收方名称
- receiverName?: string
- // 分账关系类型
- relationType?: string
- // 分账关系名称
- relationName?: string
- // 是否服务商模式
- isv?: boolean
- // 是否绑定
- bind?: boolean
- // 错误提示
- errorMsg?: string
-}
diff --git a/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBindEdit.vue b/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBindEdit.vue
deleted file mode 100644
index c7a141a6..00000000
--- a/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBindEdit.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
- 直联
- 服务商
-
-
-
- {{ form.appName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 保存
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBindList.vue b/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBindList.vue
deleted file mode 100644
index 8e71b5bb..00000000
--- a/src/views/daxpay/common/channel/wechat/receiver/bind/WechatReceiverBindList.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
+
+
+
+
+
([])
+ const authTypes = ref([])
const merchantList = ref([])
const mchAppList = ref([])
@@ -109,7 +124,20 @@
async function initData() {
// 通道
channels.value = await dictDropDown('channel')
- mchAppDropdownByEnable().then(({ data }) => {
+ // 认证类型
+ authTypes.value = await dictDropDown('channel_auth_type')
+ // 商户
+ dropdownByEnable().then(({ data }) => {
+ merchantList.value = data
+ })
+ }
+
+ /**
+ * 商户变动时刷新应用列表
+ */
+ function merchantChange() {
+ form.value.appId = undefined
+ mchAppDropdownByEnable(form.value.mchNo).then(({ data }) => {
mchAppList.value = data
})
}
diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
index dc9a3684..64809373 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
+++ b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
@@ -85,6 +85,8 @@ export interface PayParam {
amount?: number
/** 付款码 */
authCode?: string
+ /** 终端设备编码 */
+ terminalNo?: string
/** openId */
openId?: string
/** 支付扩展参数 */
@@ -99,6 +101,8 @@ export interface PayParam {
notifyUrl?: string
/** 终端IP */
clientIp?: string
+ /** 商户号 */
+ mchNo?: string
/** 应用号 */
appId?: string
/** 随机数 */
@@ -121,6 +125,8 @@ export interface PayResult {
status?: string
/** 支付参数体 */
payBody?: string
+ /** 商户号 */
+ mchNo?: string
/** 应用号 */
appId?: string
/** 随机数 */
@@ -151,6 +157,8 @@ export interface RefundParam {
notifyUrl?: string
/** 终端IP */
clientIp?: string
+ /** 商户号 */
+ mchNo?: string
/** 应用号 */
appId?: string
/** 随机数 */
@@ -171,6 +179,8 @@ export interface RefundResult {
bizRefundNo?: string
/** 退款状态 */
status?: string
+ /** 商户号 */
+ mchNo?: string
/** 应用号 */
appId?: string
/** 随机数 */
@@ -207,6 +217,8 @@ export interface TransferParam {
notifyUrl?: string
/** 终端IP */
clientIp?: string
+ /** 商户号 */
+ mchNo?: string
/** 应用号 */
appId?: string
/** 随机数 */
@@ -228,6 +240,8 @@ export interface TransferResult {
status?: string
/** 提示信息 */
errorMsg?: string
+ /** 商户号 */
+ mchNo?: string
/** 应用号 */
appId?: string
/** 随机数 */
@@ -274,6 +288,8 @@ export interface GatewayPayParam {
notifyUrl?: string
/** 终端IP */
clientIp?: string
+ /** 商户号 */
+ mchNo?: string
/** 应用号 */
appId?: string
/** 随机数 */
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue b/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
index 9bbcf8ea..51c2c6e2 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
@@ -10,6 +10,15 @@
:wrapperCol="{ span: 18 }"
:validate-trigger="['blur', 'change']"
>
+
+
-
-
-
-
{
return {
+ mchNo: [{ required: true, message: '商户号不可为空' }],
appId: [{ required: true, message: '应用号不可为空' }],
gatewayPayType: [{ required: true, message: '网关支付方式不可为空' }],
bizOrderNo: [{ required: true, message: '订单号不可为空' }],
@@ -168,6 +165,7 @@
} as Record
})
+ const mchNoOptions = ref([])
const mchAppOptions = ref([])
const gatewayTypeOptions = ref([])
@@ -180,10 +178,10 @@
*/
async function initData() {
confirmLoading.value = false
- gatewayTypeOptions.value = await dictDropDown('gateway_pay_type')
- mchAppDropdownByEnable().then(({ data }) => {
- mchAppOptions.value = data
+ dropdownByEnable().then(({ data }) => {
+ mchNoOptions.value = data
})
+ gatewayTypeOptions.value = await dictDropDown('gateway_pay_type')
// 时间默认30M后
form.expiredTime = XEUtils.toDateString(
new Date(new Date().getTime() + 30 * 60 * 1000),
@@ -199,7 +197,9 @@
*/
function merchantChange() {
form.appId = undefined
-
+ mchAppDropdownByEnable(form.mchNo).then(({ data }) => {
+ mchAppOptions.value = data
+ })
}
/**
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
index b2375811..5b0b40f7 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -10,6 +10,15 @@
:wrapperCol="{ span: 18 }"
:validate-trigger="['blur', 'change']"
>
+
+
-
-
-
-
+
@@ -156,8 +154,9 @@
import { Modal } from 'ant-design-vue'
import { PayParam, paySign, tradePay } from './DevelopTrade.api'
import { LabeledValue } from 'ant-design-vue/lib/select'
+ import { dropdownByEnable as dropdownByEnable } from '@/views/daxpay/common/assist/basic/MerchantQuery.api'
import useFormEdit from '@/hooks/bootx/useFormEdit'
- import { mchAppDropdownByEnable } from '@/views/daxpay/admin/merchant/app/MchAppAdmin.api'
+ import { dropdownEnableByMchNo as mchAppDropdownByEnable } from '@/views/daxpay/common/assist/basic/MchAppQuery.api'
import { useDict } from '@/hooks/bootx/useDict'
import XEUtils from 'xe-utils'
import { buildShortUUID, buildUUID } from '@/utils/uuid'
@@ -178,6 +177,7 @@
})
const rules = computed(() => {
return {
+ mchNo: [{ required: true, message: '商户号不可为空' }],
appId: [{ required: true, message: '应用号不可为空' }],
channel: [{ required: true, message: '支付通道不可为空' }],
bizOrderNo: [{ required: true, message: '订单号不可为空' }],
@@ -196,6 +196,7 @@
} as Record
})
+ const mchNoOptions = ref([])
const mchAppOptions = ref([])
const channelOptions = ref([])
const methodOptions = ref([])
@@ -209,11 +210,11 @@
*/
async function initData() {
confirmLoading.value = false
+ dropdownByEnable().then(({ data }) => {
+ mchNoOptions.value = data
+ })
channelOptions.value = await dictDropDown('channel')
methodOptions.value = await dictDropDown('pay_method')
- mchAppDropdownByEnable().then(({ data }) => {
- mchAppOptions.value = data
- })
// 时间默认30M后
form.expiredTime = XEUtils.toDateString(
new Date(new Date().getTime() + 30 * 60 * 1000),
@@ -224,6 +225,16 @@
updateReqTime()
}
+ /**
+ * 商户变动时刷新应用列表
+ */
+ function merchantChange() {
+ form.appId = undefined
+ mchAppDropdownByEnable(form.mchNo).then(({ data }) => {
+ mchAppOptions.value = data
+ })
+ }
+
/**
* 生成订单号
*/
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue b/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue
index b1735ae4..bd2ab22b 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue
@@ -10,6 +10,15 @@
:wrapperCol="{ span: 18 }"
:validate-trigger="['blur', 'change']"
>
+
+
{
return {
+ mchNo: [{ required: true, message: '商户号不可为空' }],
appId: [{ required: true, message: '应用号不可为空' }],
bizRefundNo: [{ required: true, message: '商户退款号不可为空' }],
title: [{ required: true, message: '退款标题不可为空' }],
@@ -122,6 +133,7 @@
} as Record
})
+ const mchNoOptions = ref([])
const mchAppOptions = ref([])
onMounted(() => {
@@ -133,8 +145,8 @@
*/
async function initData() {
confirmLoading.value = false
- mchAppDropdownByEnable().then(({ data }) => {
- mchAppOptions.value = data
+ dropdownByEnable().then(({ data }) => {
+ mchNoOptions.value = data
})
// 时间默认30M后
genNonceStr()
@@ -142,6 +154,16 @@
updateReqTime()
}
+ /**
+ * 商户变动时刷新应用列表
+ */
+ function merchantChange() {
+ form.appId = undefined
+ mchAppDropdownByEnable(form.mchNo).then(({ data }) => {
+ mchAppOptions.value = data
+ })
+ }
+
/**
* 生成订单号
*/
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
index bc6ecfbd..2af194be 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
@@ -10,6 +10,15 @@
:wrapperCol="{ span: 18 }"
:validate-trigger="['blur', 'change']"
>
+
+
{
return {
+ mchNo: [{ required: true, message: '商户号不可为空' }],
appId: [{ required: true, message: '应用号不可为空' }],
channel: [{ required: true, message: '支付通道不可为空' }],
bizTransferNo: [{ required: true, message: '商户转账号不可为空' }],
@@ -143,6 +154,7 @@
} as Record
})
+ const mchNoOptions = ref([])
const mchAppOptions = ref([])
const channelOptions = ref([])
const payeeTypeOptions = ref([])
@@ -158,14 +170,23 @@
confirmLoading.value = false
channelOptions.value = await dictDropDown('channel')
payeeTypeOptions.value = await dictDropDown('transfer_payee_type')
- mchAppDropdownByEnable().then(({ data }) => {
- mchAppOptions.value = data
+ dropdownByEnable().then(({ data }) => {
+ mchNoOptions.value = data
})
genNonceStr()
genBizOrderNo()
updateReqTime()
}
+ /**
+ * 商户变动时刷新应用列表
+ */
+ function merchantChange() {
+ form.appId = undefined
+ mchAppDropdownByEnable(form.mchNo).then(({ data }) => {
+ mchAppOptions.value = data
+ })
+ }
/**
* 生成订单号
diff --git a/src/views/daxpay/common/device/qrcode/AssistAgentModel.vue b/src/views/daxpay/common/device/qrcode/AssistAgentModel.vue
new file mode 100644
index 00000000..2422f511
--- /dev/null
+++ b/src/views/daxpay/common/device/qrcode/AssistAgentModel.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 划拨
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/qrcode/BindAppModel.vue b/src/views/daxpay/common/device/qrcode/BindAppModel.vue
new file mode 100644
index 00000000..893c28e4
--- /dev/null
+++ b/src/views/daxpay/common/device/qrcode/BindAppModel.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 绑定
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue b/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue
new file mode 100644
index 00000000..74f851c1
--- /dev/null
+++ b/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 绑定
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/qrcode/CashierCode.api.ts b/src/views/daxpay/common/device/qrcode/CashierCode.api.ts
new file mode 100644
index 00000000..7c729b09
--- /dev/null
+++ b/src/views/daxpay/common/device/qrcode/CashierCode.api.ts
@@ -0,0 +1,176 @@
+import { defHttp } from '@/utils/http/axios'
+import { PageResult, Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 分页查询
+ */
+export function page(queryParam) {
+ return defHttp.get>>({
+ url: '/cashier/code/page',
+ params: queryParam,
+ })
+}
+
+/**
+ * 查询详情
+ */
+export function get(id) {
+ return defHttp.get>({
+ url: '/cashier/code/findById',
+ params: { id },
+ })
+}
+
+/**
+ * 批量创建
+ */
+export function createBatch(data: CashierCodeBatch) {
+ return defHttp.post>({
+ url: '/cashier/code/createBatch',
+ data,
+ })
+}
+
+/**
+ * 修改
+ */
+export function update(data) {
+ return defHttp.post>({
+ url: '/cashier/code/update',
+ data,
+ })
+}
+
+/**
+ * 分配代理商
+ */
+export function assignAgent(data) {
+ return defHttp.post>({
+ url: '/cashier/code/assignAgent',
+ data,
+ })
+}
+
+/**
+ * 取消分配代理商
+ */
+export function recoverAgent(data){
+ return defHttp.post>({
+ url: '/cashier/code/recoverAgent',
+ data,
+ })
+}
+
+/**
+ * 绑定商户和应用
+ */
+export function bindMch(data) {
+ return defHttp.post>({
+ url: '/cashier/code/bindMerchant',
+ data,
+ })
+}
+
+/**
+ * 取消绑定商户
+ */
+export function unbindMch(data) {
+ return defHttp.post>({
+ url: '/cashier/code/unbindMerchant',
+ data,
+ })
+}
+
+/**
+ * 绑定应用
+ */
+export function bindApp(data) {
+ return defHttp.post>({
+ url: '/cashier/code/bindApp',
+ data,
+ })
+}
+
+/**
+ * 解绑应用
+ */
+export function unbindApp(data) {
+ return defHttp.post>({
+ url: '/cashier/code/unbindApp',
+ data,
+ })
+}
+
+/**
+ * 删除
+ */
+export function del(id) {
+ return defHttp.post>({
+ url: '/cashier/code/delete',
+ params: { id },
+ })
+}
+
+/**
+ * 判断是否存在
+ */
+export function existsByBatchNo(batchNo) {
+ return defHttp.get>({
+ url: '/cashier/code/existsByBatchNo',
+ params: { batchNo },
+ })
+}
+/**
+ * 判断是否存在
+ */
+export function getCodeLink(code) {
+ return defHttp.get>({
+ url: '/cashier/code/getCodeLink',
+ params: { code },
+ })
+}
+
+/**
+ * 收款码牌
+ */
+export interface CashierCode extends MchEntity {
+ /** 固定金额/任意金额 */
+ amountType?: string
+ /** 金额 */
+ amount?: number
+ /** 名称 */
+ name?: string
+ /** 编号 */
+ code?: string
+ /** 配置Id */
+ configId?: number
+ /** 模板ID */
+ templateId?: number
+ /** 状态 */
+ enable?: boolean
+ /** 批次号 */
+ batchNo?: string
+}
+
+/**
+ * 批量创建收款码参数
+ * @author xxm
+ * @since 2025/7/1
+ */
+export interface CashierCodeBatch {
+ /** 批次号 */
+ batchNo?: string
+ /** 创建数量 */
+ count?: number
+ /** 模板Id */
+ templateId?: number
+ /** 配置Id */
+ configId?: number
+ /** 金额类型 */
+ amountType?: string
+ /** 金额 */
+ amount?: number
+ /** 状态 */
+ enable?: boolean
+}
diff --git a/src/views/daxpay/common/device/qrcode/CashierCodeCreate.vue b/src/views/daxpay/common/device/qrcode/CashierCodeCreate.vue
new file mode 100644
index 00000000..408335d0
--- /dev/null
+++ b/src/views/daxpay/common/device/qrcode/CashierCodeCreate.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+ 生成
+
+
+
+
+
+
+ 固定金额
+ 任意金额
+
+
+
+
+
+
+ 启用
+ 禁用
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/qrcode/CashierCodeEdit.vue b/src/views/daxpay/common/device/qrcode/CashierCodeEdit.vue
new file mode 100644
index 00000000..46ec574c
--- /dev/null
+++ b/src/views/daxpay/common/device/qrcode/CashierCodeEdit.vue
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+
+
+
+
+ 固定金额
+ 任意金额
+
+
+
+
+
+
+ 启用
+ 禁用
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/qrcode/CashierCodeList.vue b/src/views/daxpay/common/device/qrcode/CashierCodeList.vue
new file mode 100644
index 00000000..a8897a02
--- /dev/null
+++ b/src/views/daxpay/common/device/qrcode/CashierCodeList.vue
@@ -0,0 +1,364 @@
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 划拨
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/terminal/BindAppModel.vue b/src/views/daxpay/common/device/terminal/BindAppModel.vue
new file mode 100644
index 00000000..8d6ca897
--- /dev/null
+++ b/src/views/daxpay/common/device/terminal/BindAppModel.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 绑定
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/terminal/BindMchAppModel.vue b/src/views/daxpay/common/device/terminal/BindMchAppModel.vue
new file mode 100644
index 00000000..3dd0ab39
--- /dev/null
+++ b/src/views/daxpay/common/device/terminal/BindMchAppModel.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 绑定
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/assist/terminal/TerminalDevice.api.ts b/src/views/daxpay/common/device/terminal/TerminalDevice.api.ts
similarity index 56%
rename from src/views/daxpay/common/assist/terminal/TerminalDevice.api.ts
rename to src/views/daxpay/common/device/terminal/TerminalDevice.api.ts
index b94c6ecc..5e7f079a 100644
--- a/src/views/daxpay/common/assist/terminal/TerminalDevice.api.ts
+++ b/src/views/daxpay/common/device/terminal/TerminalDevice.api.ts
@@ -8,7 +8,7 @@ import { LabeledValue } from 'ant-design-vue/lib/select'
*/
export function page(params: any) {
return defHttp.get>>({
- url: '/terminal/device/page',
+ url: '/device/terminal/page',
params,
})
}
@@ -18,17 +18,77 @@ export function page(params: any) {
*/
export function get(id: string) {
return defHttp.get>({
- url: '/terminal/device/findById',
+ url: '/device/terminal/findById',
params: { id },
})
}
+/**
+ * 分配代理商
+ */
+export function assignAgent(data) {
+ return defHttp.post>({
+ url: '/device/terminal/assignAgent',
+ data,
+ })
+}
+
+/**
+ * 取消分配代理商
+ */
+export function recoverAgent(data) {
+ return defHttp.post>({
+ url: '/device/terminal/recoverAgent',
+ data,
+ })
+}
+
+/**
+ * 绑定商户和应用
+ */
+export function bindMch(data) {
+ return defHttp.post>({
+ url: '/device/terminal/bindMerchant',
+ data,
+ })
+}
+
+/**
+ * 取消绑定商户
+ */
+export function unbindMch(data) {
+ return defHttp.post>({
+ url: '/device/terminal/unbindMerchant',
+ data,
+ })
+}
+
+/**
+ * 绑定应用
+ */
+export function bindApp(data) {
+ return defHttp.post>({
+ url: '/device/terminal//bindApp',
+ data,
+ })
+}
+
+/**
+ * 解绑应用
+ */
+export function unbindApp(data) {
+ return defHttp.post>({
+ url: '/device/terminal/unbindApp',
+ data,
+ })
+}
+
/**
* 新增
*/
export function add(data: TerminalDevice) {
return defHttp.post>({
- url: '/terminal/device/add',
+ url: '/device/terminal/add',
data,
})
}
@@ -38,7 +98,7 @@ export function add(data: TerminalDevice) {
*/
export function update(data: TerminalDevice) {
return defHttp.post>({
- url: '/terminal/device/edit',
+ url: '/device/terminal/edit',
data,
})
}
@@ -47,18 +107,18 @@ export function update(data: TerminalDevice) {
* 删除
*/
export function remove(id: string) {
- return defHttp.delete>({
- url: '/terminal/device/delete',
+ return defHttp.post>({
+ url: '/device/terminal/delete',
params: { id },
})
}
/**
- * 根据AppId查询下拉列表
+ * 根据AppId获取下拉列表
*/
-export function dropdown(appId) {
+export function dropdownByAppId(appId) {
return defHttp.get>({
- url: '/terminal/device/dropdown',
+ url: '/device/terminal/dropdownByAppId',
params: { appId },
})
}
diff --git a/src/views/daxpay/common/assist/terminal/TerminalDeviceEdit.vue b/src/views/daxpay/common/device/terminal/TerminalDeviceEdit.vue
similarity index 95%
rename from src/views/daxpay/common/assist/terminal/TerminalDeviceEdit.vue
rename to src/views/daxpay/common/device/terminal/TerminalDeviceEdit.vue
index 85656a32..94fd8273 100644
--- a/src/views/daxpay/common/assist/terminal/TerminalDeviceEdit.vue
+++ b/src/views/daxpay/common/device/terminal/TerminalDeviceEdit.vue
@@ -36,12 +36,30 @@
placeholder="请选择终端类型"
/>
+
+
支持
不支持
+
+
-
-
-
+
- 新建
+
+ 新建
+
+ 批量操作
+
+
+
+ 代理商划拨
+
+
+ 代理商回收
+
+
+ 商户应用绑定
+
+
+ 商户应用解绑
+
+
+ 应用绑定
+
+
+ 应用解绑
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/terminal/channel/ChannelTerminalEdit.vue b/src/views/daxpay/common/device/terminal/channel/ChannelTerminalEdit.vue
new file mode 100644
index 00000000..5c6cf2d2
--- /dev/null
+++ b/src/views/daxpay/common/device/terminal/channel/ChannelTerminalEdit.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts
deleted file mode 100644
index 5643998d..00000000
--- a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { Result } from '#/axios'
-import { MchEntity } from '#/web'
-
-/**
- * 配置列表
- */
-export function findAll(appId) {
- return defHttp.get>({
- url: '/channel/cashier/config/findByAppId',
- params: { appId },
- })
-}
-
-/**
- * 配置详情
- */
-export function get(id) {
- return defHttp.get>({
- url: '/channel/cashier/config/findById',
- params: { id },
- })
-}
-
-/**
- * 配置是否存在
- */
-export function existsByType(appId, type) {
- return defHttp.get>({
- url: '/channel/cashier/config/existsByType',
- params: { appId, type },
- })
-}
-
-/**
- * 配置是否存在
- */
-export function existsByTypeNotId(appId, type, id) {
- return defHttp.get>({
- url: '/channel/cashier/config/existsByTypeNotId',
- params: { appId, type, id },
- })
-}
-
-/**
- * 配置保存
- */
-export function add(data: ChannelCashierConfig) {
- return defHttp.post>({
- url: '/channel/cashier/config/save',
- data,
- })
-}
-
-/**
- * 配置更新
- */
-export function update(data: ChannelCashierConfig) {
- return defHttp.post>({
- url: '/channel/cashier/config/update',
- data,
- })
-}
-
-/**
- * 配置删除
- */
-export function remove(id) {
- return defHttp.post>({
- url: '/channel/cashier/config/delete',
- params: { id },
- })
-}
-
-/**
- * 获取码牌地址
- */
-export function getQrCodeUrl(appId) {
- return defHttp.get>({
- url: '/channel/cashier/config/qrCodeUrl',
- params: { appId },
- })
-}
-
-/**
- * 通道收银台配置
- */
-export interface ChannelCashierConfig extends MchEntity {
- // 收银台类型
- cashierType?: string
- // 收银台名称
- cashierName?: string
- // 支付通道
- channel?: string
- // 支付方式
- payMethod?: string
- // 是否开启分账
- allocation?: boolean
- // 自动分账
- autoAllocation?: boolean
- // 备注
- remark?: string
-}
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue
deleted file mode 100644
index 0efd88d3..00000000
--- a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 保存
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
deleted file mode 100644
index 80b308a4..00000000
--- a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
-
- 新建
-
-
-
-
-
-
- {{ dictConvert('cashier_type', row.cashierType) }}
-
-
-
-
- {{ dictConvert('channel', row.channel) }}
-
-
-
-
- {{ dictConvert('pay_method', row.payMethod) }}
-
-
-
-
- 开启
- 关闭
-
-
-
-
- 开启
- 关闭
-
-
-
-
- 查看
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue
deleted file mode 100644
index 59cfc922..00000000
--- a/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/merchant/config/ChannelConfig.api.ts b/src/views/daxpay/common/merchant/config/ChannelConfig.api.ts
index 42918090..2d76e42b 100644
--- a/src/views/daxpay/common/merchant/config/ChannelConfig.api.ts
+++ b/src/views/daxpay/common/merchant/config/ChannelConfig.api.ts
@@ -2,6 +2,7 @@ import { defHttp } from '@/utils/http/axios'
import { Result } from '#/axios'
import { MchEntity } from '#/web'
import { unref } from 'vue'
+import { LabeledValue } from 'ant-design-vue/lib/select'
/**
* 列表
@@ -15,6 +16,16 @@ export function findAll(appId) {
})
}
+/**
+ * 根据应用AppId获取启用的通道
+ */
+export function dropdownByEnable(appId) {
+ return defHttp.get>({
+ url: '/channel/config/dropdownByEnable',
+ params: { appId },
+ })
+}
+
/**
* 支付通道配置
*/
diff --git a/src/views/daxpay/common/merchant/config/ChannelConfigEdit.vue b/src/views/daxpay/common/merchant/config/ChannelConfigEdit.vue
index 55819a96..66b9003f 100644
--- a/src/views/daxpay/common/merchant/config/ChannelConfigEdit.vue
+++ b/src/views/daxpay/common/merchant/config/ChannelConfigEdit.vue
@@ -1,24 +1,28 @@
{{ task.createTime }}
+
+ {{ task.mchNo }}
+
{{ task.appId }}
diff --git a/src/views/daxpay/common/notice/callback/CallbackTaskList.vue b/src/views/daxpay/common/notice/callback/CallbackTaskList.vue
index a1a3f9c6..6877ab81 100644
--- a/src/views/daxpay/common/notice/callback/CallbackTaskList.vue
+++ b/src/views/daxpay/common/notice/callback/CallbackTaskList.vue
@@ -49,7 +49,8 @@
align="center"
/>
@@ -79,7 +80,7 @@
+
+
diff --git a/src/views/daxpay/merchant/app/MchAppList.vue b/src/views/daxpay/merchant/app/MchAppList.vue
new file mode 100644
index 00000000..aea09f2f
--- /dev/null
+++ b/src/views/daxpay/merchant/app/MchAppList.vue
@@ -0,0 +1,250 @@
+
+ ({
+ url: '/merchant/get',
+ })
+}
+
+/**
+ * 支付交易信息统计
+ */
+export function payTradeReport(params) {
+ return defHttp.get>({
+ url: '/merchant/report/index/pay',
+ params,
+ })
+}
+
+/**
+ * 退款交易信息统计
+ */
+export function rfdTradeReport(params) {
+ return defHttp.get>({
+ url: '/merchant/report/index/refund',
+ params,
+ })
+}
+
+/**
+ * 支付交易通道统计
+ */
+export function payChannelReport(params) {
+ return defHttp.get>({
+ url: '/merchant/report/index/payChannel',
+ params,
+ })
+}
+
+/**
+ * 退款交易通道统计
+ */
+export function refundChannelReport(params) {
+ return defHttp.get>({
+ url: '/merchant/report/index/refundChannel',
+ params,
+ })
+}
+
+/**
+ * 支付方式统计
+ */
+export function payMethodReport(params) {
+ return defHttp.get>({
+ url: '/merchant/report/index/payMethod',
+ params,
+ })
+}
+
+/**
+ * 交易统计报表
+ */
+export function tradeStatisticsReport(params) {
+ return defHttp.get>({
+ url: '/merchant/report/index/tradeStatisticsReport',
+ params,
+ })
+}
+
+/**
+ * 交易报表
+ */
+export interface TradeReportResult {
+ /** 标题 */
+ title?: string
+
+ /** 交易金额 */
+ tradeAmount?: number
+
+ /** 交易笔数 */
+ tradeCount?: number
+
+ /** 最大单笔金额 */
+ maxAmount?: number
+
+ /** 平均单笔金额 */
+ avgAmount?: number
+}
+
+/**
+ * 交易统计报表
+ */
+export interface TradeStatisticsReport {
+ /** 日期 */
+ date?: string
+ /** 交易金额 */
+ payAmount?: number
+ /** 交易笔数 */
+ payCount?: number
+ /** 退款金额 */
+ refundAmount?: number
+ /** 退款笔数 */
+ refundCount?: number
+}
diff --git a/src/views/daxpay/merchant/dashboard/components/GrowCard.vue b/src/views/daxpay/merchant/dashboard/components/GrowCard.vue
new file mode 100644
index 00000000..1ba72205
--- /dev/null
+++ b/src/views/daxpay/merchant/dashboard/components/GrowCard.vue
@@ -0,0 +1,374 @@
+
+
+
+
+
diff --git a/src/views/daxpay/merchant/dashboard/components/VisitAnalysis.vue b/src/views/daxpay/merchant/dashboard/components/VisitAnalysis.vue
new file mode 100644
index 00000000..0da2a5eb
--- /dev/null
+++ b/src/views/daxpay/merchant/dashboard/components/VisitAnalysis.vue
@@ -0,0 +1,83 @@
+
+
+
+
diff --git a/src/views/daxpay/merchant/dashboard/components/VisitSource.vue b/src/views/daxpay/merchant/dashboard/components/VisitSource.vue
new file mode 100644
index 00000000..bc8c0268
--- /dev/null
+++ b/src/views/daxpay/merchant/dashboard/components/VisitSource.vue
@@ -0,0 +1,278 @@
+
+ >({
+ url: '/merchant/get',
+ })
+}
+
+/**
+ * 更新
+ */
+export const update = (data: Merchant) => {
+ return defHttp.post>({
+ url: '/merchant/update',
+ data,
+ })
+}
diff --git a/src/views/daxpay/merchant/info/MerchantInfo.vue b/src/views/daxpay/merchant/info/MerchantInfo.vue
new file mode 100644
index 00000000..fa467226
--- /dev/null
+++ b/src/views/daxpay/merchant/info/MerchantInfo.vue
@@ -0,0 +1,156 @@
+
+
+
+
diff --git a/src/views/daxpay/admin/dashboard/index.vue b/src/views/daxpay/admin/dashboard/index.vue
index e7ed2f96..e3130585 100644
--- a/src/views/daxpay/admin/dashboard/index.vue
+++ b/src/views/daxpay/admin/dashboard/index.vue
@@ -1,21 +1,82 @@
-
+
+
+
+
+
+ 支付通道
+
+
+
+
+
+ 支付方式
+
+
+
+
+
+
+ 退款通道
+
+
交易统计
+
+
-
- >({
+ url: '/isv/channel/config/findAll',
+ })
+}
+
+/**
+ * 服务商通道配置
+ */
+export interface IsvChannelConfig extends MchEntity {
+ channel?: string
+ // 通道名称
+ name?: string
+ // 是否启用
+ enable?: boolean
+ // 通道服务商号
+ outIsvNo?: string
+ // 服务商号
+ isvNo?: string
+}
diff --git a/src/views/daxpay/admin/isv/config/IsvChannelConfigEdit.vue b/src/views/daxpay/admin/isv/config/IsvChannelConfigEdit.vue
new file mode 100644
index 00000000..562c964a
--- /dev/null
+++ b/src/views/daxpay/admin/isv/config/IsvChannelConfigEdit.vue
@@ -0,0 +1,69 @@
+
+ >({
+ url: '/isv/gateway/config/getConfig',
+ })
+}
+
+/**
+ * 保存网关支付配置
+ */
+export function saveConfig(data: GatewayConfig) {
+ return defHttp.post>({
+ url: '/isv/gateway/config/save',
+ data,
+ })
+}
+
+/**
+ * 更新网关支付配置
+ */
+export function updateConfig(data: GatewayConfig) {
+ return defHttp.post>({
+ url: '/isv/gateway/config/update',
+ data,
+ })
+}
+
+/**
+ * 收银台配置
+ */
+export interface GatewayConfig extends MchEntity {
+ /** 收银台名称 */
+ name?: string
+ /** PC收银台是否同时显示聚合收银码 */
+ aggregateShow?: boolean
+ /** PC收银台是否显示聚合条码支付 */
+ barPayShow?: boolean
+ /** h5收银台自动升级聚合支付 */
+ h5AutoUpgrade?: boolean
+ /** 小程序开启分账 */
+ miniAppAllocation?: boolean
+ /** 小程序自动分账 */
+ miniAppAutoAllocation?: boolean
+ /** 限制小程序支付方式 */
+ miniAppLimitPay?: string
+ /** 小程序关联终端号 */
+ miniAppTerminalNo?: string
+}
diff --git a/src/views/daxpay/admin/isv/gateway/GatewayConfigEdit.vue b/src/views/daxpay/admin/isv/gateway/GatewayConfigEdit.vue
new file mode 100644
index 00000000..bbe33b0d
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/GatewayConfigEdit.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+ 不显示
+ 显示
+
+
+
+
+ 不升级
+ 升级
+
+
+
+
+ 取消
+ {{ form.id ? '更新' : '保存' }}
+
+ 编辑信息
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/isv/gateway/GatewayConfigModel.vue b/src/views/daxpay/admin/isv/gateway/GatewayConfigModel.vue
new file mode 100644
index 00000000..6d7cf88d
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/GatewayConfigModel.vue
@@ -0,0 +1,41 @@
+
+ >({
+ url: '/isv/aggregate/config/listByPay',
+ })
+}
+/**
+ * 获取聚合支付配置(根据Id)
+ */
+export function getAggregateConfig(id) {
+ return defHttp.get>({
+ url: '/isv/aggregate/config/findPayById',
+ params: {
+ id,
+ },
+ })
+}
+
+/**
+ * 聚合支付配置是否存在
+ */
+export function existsAggregateConfig(type) {
+ return defHttp.get>({
+ url: '/isv/aggregate/config/existsPay',
+ params: {
+ type,
+ },
+ })
+}
+
+/**
+ * 聚合支付配置是否存在(不包含自身)
+ */
+export function existsAggregateConfigNotId(type, id) {
+ return defHttp.get>({
+ url: '/isv/aggregate/config/existsPayNotId',
+ params: {
+ type,
+ id,
+ },
+ })
+}
+
+/**
+ * 保存聚合支付配置
+ */
+export function saveAggregateConfig(data: AggregateConfig) {
+ return defHttp.post>({
+ url: '/isv/aggregate/config/savePay',
+ data,
+ })
+}
+
+/**
+ * 更新聚合支付配置
+ */
+export function updateAggregateConfig(data: AggregateConfig) {
+ return defHttp.post>({
+ url: '/isv/aggregate/config/updatePay',
+ data,
+ })
+}
+
+/**
+ * 删除聚合支付配置
+ */
+export function delAggregateConfig(id) {
+ return defHttp.post({
+ url: '/isv/aggregate/config/deletePay',
+ params: { id },
+ })
+}
+
+/**
+ * 获取聚合付款码支付配置(列表)
+ */
+export function getAggregatePayCodeConfigs() {
+ return defHttp.get>({
+ url: '/isv/aggregate/config/listByBar',
+ })
+}
+
+/**
+ * 获取聚合付款码支付配置(根据ID)
+ */
+export function getAggregatePayCodeConfig(id) {
+ return defHttp.get>({
+ url: '/isv/aggregate/config/findBarById',
+ params: {
+ id,
+ },
+ })
+}
+
+/**
+ * 聚合付款码支付配置是否存在
+ */
+export function existsAggregatePayCodeConfig(type) {
+ return defHttp.get>({
+ url: '/isv/aggregate/config/existsBar',
+ params: {
+ type,
+ },
+ })
+}
+
+/**
+ * 聚合付款码支付配置是否存在(不包含自身)
+ */
+export function existsAggregatePayCodeConfigNotId(type, id) {
+ return defHttp.get>({
+ url: '/isv/aggregate/config/existsBarNotId',
+ params: {
+ type,
+ id,
+ },
+ })
+}
+
+/**
+ * 保存聚合付款码支付配置
+ */
+export function saveAggregatePayCodeConfig(data: AggregateConfig) {
+ return defHttp.post>({
+ url: '/isv/aggregate/config/saveBar',
+ data,
+ })
+}
+
+/**
+ * 更新聚合付款码支付配置
+ */
+export function updateAggregatePayCodeConfig(data: AggregateConfig) {
+ return defHttp.post>({
+ url: '/isv/aggregate/config/updateBar',
+ data,
+ })
+}
+
+/**
+ * 删除聚合付款码支付配置
+ */
+export function delAggregatePayCodeConfig(id) {
+ return defHttp.post({
+ url: '/isv/aggregate/config/deleteBar',
+ params: { id },
+ })
+}
+
+/**
+ * 收银台聚合扫码支付配置
+ */
+export interface AggregateConfig extends MchEntity {
+ /** 支付类型 */
+ type?: string
+ /** 支付类型 */
+ aggregateType?: string
+ /** 通道 */
+ channel?: string
+ /** 支付方式 */
+ payMethod?: string
+ /** 自动拉起支付 */
+ autoLaunch?: boolean
+ /** 需要获取OpenId */
+ needOpenId?: boolean
+ /** 其他支付方式 */
+ otherMethod?: string
+ /** 发起调用的类型 */
+ callType?: string
+}
+
+/**
+ * 收银台聚合付款码支付配置
+ */
+export interface AggregatePayCodeConfig extends MchEntity {
+ /** 付款码类型 */
+ barPayType?: string
+ /** 通道 */
+ channel?: string
+ /** 支付方式 */
+ payMethod?: string
+ /** 其他支付方式 */
+ otherMethod?: string
+ /** 自动拉起支付 */
+ autoLaunch?: boolean
+ /** 需要获取OpenId */
+ needOpenId?: boolean
+}
diff --git a/src/views/daxpay/admin/isv/gateway/aggregate/AggregateCodeEdit.vue b/src/views/daxpay/admin/isv/gateway/aggregate/AggregateCodeEdit.vue
new file mode 100644
index 00000000..59091318
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/aggregate/AggregateCodeEdit.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/isv/gateway/aggregate/AggregateCodeList.vue b/src/views/daxpay/admin/isv/gateway/aggregate/AggregateCodeList.vue
new file mode 100644
index 00000000..28145272
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/aggregate/AggregateCodeList.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/merchant/gateway/codeCard/CodeCardTypeConfigList.vue b/src/views/daxpay/admin/isv/gateway/aggregate/AggregateConfigList.vue
similarity index 53%
rename from src/views/daxpay/common/merchant/gateway/codeCard/CodeCardTypeConfigList.vue
rename to src/views/daxpay/admin/isv/gateway/aggregate/AggregateConfigList.vue
index 30be3cba..dcce1b71 100644
--- a/src/views/daxpay/common/merchant/gateway/codeCard/CodeCardTypeConfigList.vue
+++ b/src/views/daxpay/admin/isv/gateway/aggregate/AggregateConfigList.vue
@@ -1,12 +1,5 @@
-
+
@@ -16,9 +9,12 @@
+
+
- {{ dictConvert('cashier_code_type', row.type) }}
+ {{
+ dictConvert('aggregate_pay_type', row.aggregateType)
+ }}
@@ -28,107 +24,92 @@
- {{ dictConvert('pay_method', row.payMethod) }}
+
+ {{ dictConvert(`${row.channel}_method`, row.otherMethod) }}
+
+
+ {{ dictConvert('pay_method', row.payMethod) }}
+
-
-
-
- {{ row.needOpenId ? '需要' : '不需要' }}
-
-
-
-
+
{{ dictConvert('gateway_call_type', row.callType) }}
-
+
+
+ 是
+ 否
+
+
+
+
+ 是
+ 否
+
+
+
- 查看
-
-
+
+
diff --git a/src/views/daxpay/admin/isv/gateway/cashier/Cashier.api.ts b/src/views/daxpay/admin/isv/gateway/cashier/Cashier.api.ts
new file mode 100644
index 00000000..3c8c9886
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/cashier/Cashier.api.ts
@@ -0,0 +1,159 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 获取分组配置列表
+ */
+export function getGroupConfigs(cashierType) {
+ return defHttp.get>({
+ url: '/isv/cashier/config/listByType',
+ params: {
+ cashierType,
+ },
+ })
+}
+/**
+ * 获取分组配置列表
+ */
+export function getGroupConfig(id) {
+ return defHttp.get>({
+ url: '/isv/cashier/config/findGroupById',
+ params: { groupId: id },
+ })
+}
+
+/**
+ * 保存分组配置
+ */
+export function saveGroupConfig(data: CashierGroupConfig) {
+ return defHttp.post>({
+ url: '/isv/cashier/config/saveGroup',
+ data,
+ })
+}
+
+/**
+ * 创建默认分组(h5)
+ */
+export function saveDefaultGroup() {
+ return defHttp.post>({
+ url: '/isv/cashier/config/saveDefaultGroup',
+ })
+}
+
+/**
+ * 更新分组配置
+ */
+export function updateGroupConfig(data: CashierGroupConfig) {
+ return defHttp.post>({
+ url: '/isv/cashier/config/updateGroup',
+ data,
+ })
+}
+
+/**
+ * 删除分组配置
+ */
+export function delGroupConfig(id) {
+ return defHttp.post({
+ url: '/isv/cashier/config/deleteGroup',
+ params: { id },
+ })
+}
+
+/**
+ * 获取配置项配置列表
+ */
+export function getItemConfigs(groupId) {
+ return defHttp.get>({
+ url: '/isv/cashier/config/listByItem',
+ params: {
+ groupId,
+ },
+ })
+}
+/**
+ * 获取配置项配置
+ */
+export function getItemConfig(groupId) {
+ return defHttp.get>({
+ url: '/isv/cashier/config/findItemById',
+ params: {
+ groupId,
+ },
+ })
+}
+
+/**
+ * 保存配置项配置
+ */
+export function saveItemConfig(data: CashierItemConfig) {
+ return defHttp.post>({
+ url: '/isv/cashier/config/saveItem',
+ data,
+ })
+}
+
+/**
+ * 更新配置项配置
+ */
+export function updateItemConfig(data: CashierItemConfig) {
+ return defHttp.post>({
+ url: '/isv/cashier/config/updateItem',
+ data,
+ })
+}
+
+/**
+ * 删除配置项配置
+ */
+export function delItemConfig(id) {
+ return defHttp.post({
+ url: '/isv/cashier/config/deleteItem',
+ params: { id },
+ })
+}
+
+/**
+ * 收银台类目配置
+ */
+export interface CashierGroupConfig extends MchEntity {
+ /** 类型 web/h5/小程序 */
+ type?: string
+ /** 类型 web/h5/小程序(换成这个了) */
+ cashierType?: string
+ /** 名称 */
+ name?: string
+ /** 图标 */
+ icon?: string
+ /** 排序 */
+ sortNo?: number
+ // 背景色
+ bgColor?: string
+ // 是否推荐
+ recommend?: boolean
+}
+/**
+ * 收银台配置项
+ */
+export interface CashierItemConfig extends MchEntity {
+ /** 类目配置Id */
+ groupId?: string
+ /** 名称 */
+ name?: string
+ /** 图标 */
+ icon?: string
+ /** 排序 */
+ sortNo?: number
+ /** 发起调用的类型 */
+ callType?: string
+ /** 支付通道 */
+ channel?: string
+ /** 支付方式 */
+ payMethod?: string
+ /** 其他支付方式 */
+ otherMethod?: string
+ /** 是否推荐 */
+ recommend?: boolean
+}
diff --git a/src/views/daxpay/common/merchant/gateway/codeCard/CodeCardConfigEdit.vue b/src/views/daxpay/admin/isv/gateway/cashier/CashierGroupConfigEdit.vue
similarity index 54%
rename from src/views/daxpay/common/merchant/gateway/codeCard/CodeCardConfigEdit.vue
rename to src/views/daxpay/admin/isv/gateway/cashier/CashierGroupConfigEdit.vue
index 669b5bda..1854f187 100644
--- a/src/views/daxpay/common/merchant/gateway/codeCard/CodeCardConfigEdit.vue
+++ b/src/views/daxpay/admin/isv/gateway/cashier/CashierGroupConfigEdit.vue
@@ -1,6 +1,6 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
支付宝
+ 微信
+ 聚合支付
+
-
-
+
@@ -91,16 +74,16 @@
import useFormEdit from '@/hooks/bootx/useFormEdit'
import { FormEditType } from '@/enums/formTypeEnum'
import {
- saveCodeCardConfig,
- editCodeCardConfig,
- CodeCardConfig,
- getCodeCardListById,
- } from './CodeCard.api'
+ saveGroupConfig,
+ updateGroupConfig,
+ CashierGroupConfig,
+ getGroupConfig,
+ } from './Cashier.api'
import { nextTick, ref, unref } from 'vue'
import { FormInstance, Rule } from 'ant-design-vue/lib/form'
const props = defineProps({
- appId: String,
+ type: String,
})
const {
@@ -113,21 +96,18 @@
labelCol,
wrapperCol,
} = useFormEdit()
- const addOrEdit = ref('')
+
const formRef = ref()
- let form = ref({
- enable: true,
- allocation: false,
- autoAllocation: false,
+ let form = ref({
+ sortNo: 0,
})
// 校验
const rules = {
code: [{ required: true, message: '' }],
- name: [{ required: true, message: '请输入码牌名称' }],
- enable: [{ required: true, message: '请选择码牌是否启用' }],
- allocation: [{ required: true, message: '请选择是否开启分账' }],
- autoAllocation: [{ required: true, message: '请选择是否自动分账' }],
+ name: [{ required: true, message: '请输入分类名称' }],
+ enable: [{ required: true, message: '是否启用' }],
+ icon: [{ required: true, message: '请选择要显示的图标' }],
} as Record
// 事件
@@ -145,14 +125,12 @@
// 获取信息
function getInfo(id, editType: FormEditType) {
if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
- addOrEdit.value = 'edit'
confirmLoading.value = true
- getCodeCardListById(id).then(({ data }) => {
+ getGroupConfig(id).then(({ data }) => {
form.value = data
confirmLoading.value = false
})
} else {
- addOrEdit.value = 'add'
confirmLoading.value = false
}
}
@@ -163,11 +141,11 @@
function handleOk() {
formRef.value?.validate().then(async () => {
confirmLoading.value = true
- form.value.appId = props.appId
+ form.value.cashierType = props.type
if (formEditType.value === FormEditType.Add) {
- await saveCodeCardConfig(unref(form)).finally(() => (confirmLoading.value = false))
+ await saveGroupConfig(unref(form)).finally(() => (confirmLoading.value = false))
} else if (formEditType.value === FormEditType.Edit) {
- await editCodeCardConfig(unref(form)).finally(() => (confirmLoading.value = false))
+ await updateGroupConfig(unref(form)).finally(() => (confirmLoading.value = false))
}
handleCancel()
emits('ok')
diff --git a/src/views/daxpay/admin/isv/gateway/cashier/CashierGroupConfigList.vue b/src/views/daxpay/admin/isv/gateway/cashier/CashierGroupConfigList.vue
new file mode 100644
index 00000000..afdcf6cd
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/cashier/CashierGroupConfigList.vue
@@ -0,0 +1,158 @@
+
+
-
+
+
+
+
+
+
+
@@ -38,39 +65,28 @@
placeholder="请选择支付调起方式类型"
/>
-
+
+
+
+
+
+
+
+
+
支付宝
+ 微信
+ 聚合支付
+
-
-
-
-
-
-
+
@@ -90,25 +106,17 @@
+
diff --git a/src/views/daxpay/admin/merchant/app/MchAppAdmin.api.ts b/src/views/daxpay/admin/merchant/app/MchAppAdmin.api.ts
index b999ba6d..41de35d5 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppAdmin.api.ts
+++ b/src/views/daxpay/admin/merchant/app/MchAppAdmin.api.ts
@@ -1,14 +1,13 @@
import { defHttp } from '@/utils/http/axios'
import { PageResult, Result } from '#/axios'
import { BaseEntity } from '#/web'
-import { LabeledValue } from 'ant-design-vue/lib/select'
/**
* 分页
*/
export const page = (params) => {
return defHttp.get>>({
- url: '/mch/app/page',
+ url: '/admin/mch/app/page',
params,
})
}
@@ -17,7 +16,7 @@ export const page = (params) => {
*/
export const get = (id) => {
return defHttp.get>({
- url: '/mch/app/findById',
+ url: '/admin/mch/app/findById',
params: { id },
})
}
@@ -26,7 +25,7 @@ export const get = (id) => {
*/
export const add = (obj) => {
return defHttp.post>({
- url: '/mch/app/add',
+ url: '/admin/mch/app/add',
data: obj,
})
}
@@ -35,7 +34,7 @@ export const add = (obj) => {
*/
export const update = (obj) => {
return defHttp.post>({
- url: '/mch/app/update',
+ url: '/admin/mch/app/update',
data: obj,
})
}
@@ -45,43 +44,19 @@ export const update = (obj) => {
*/
export const del = (id) => {
return defHttp.post>({
- url: '/mch/app/delete',
+ url: '/admin/mch/app/delete',
params: { id },
})
}
-/**
- * 查询应用列表
- */
-export function mchAppDropdown() {
- return defHttp.get>({
- url: '/mch/app/dropdown',
- })
-}
-
-/**
- * 查询启用的应用列表
- */
-export function mchAppDropdownByEnable() {
- return defHttp.get>({
- url: '/mch/app/dropdownByEnable',
- })
-}
-
-/**
- * 根据应用AppId获取启用的通道
- */
-export function dropdownByEnable(appId) {
- return defHttp.get>({
- url: '/channel/config/dropdownByEnable',
- params: { appId },
- })
-}
-
/**
* 商户应用
*/
export interface MchApp extends BaseEntity {
+ // 商户号
+ mchNo?: string
+ // 商户名称
+ mchName?: string
// 应用号
appId?: string
// 应用名称
diff --git a/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue b/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue
index 688c14e9..dd0691a6 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue
+++ b/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue
@@ -21,13 +21,25 @@
+
+
+
+ {{ form.mchName }}({{ form.mchNo }})
+
- {{ form.appId }}
+ {{ form.appId }}
-
+
-
+
@@ -80,16 +96,6 @@
un-checked-children="停用"
/>
-
-
{{
@@ -101,9 +107,9 @@
生成秘钥
+ 生成秘钥
@@ -148,12 +154,15 @@
import { FormEditType } from '@/enums/formTypeEnum'
import { BasicDrawer } from '@/components/Drawer'
import { buildUUID } from '@/utils/uuid'
+ import { dropdown as merchantDropdown } from '@/views/daxpay/common/assist/basic/MerchantQuery.api'
import { LabeledValue } from 'ant-design-vue/lib/select'
import { useDict } from '@/hooks/bootx/useDict'
+ import { useMessage } from '@/hooks/web/useMessage'
const {
initFormEditType,
handleCancel,
+ search,
labelCol,
wrapperCol,
title,
@@ -164,6 +173,7 @@
formEditType,
} = useFormEdit()
const { dictDropDown } = useDict()
+ const { createConfirm } = useMessage()
// 表单
const formRef = ref()
@@ -171,6 +181,7 @@
notifyType: 'none',
signType: 'hmac_sha256',
limitAmount: 200.0,
+ signSecret: '',
orderTimeout: 30,
reqSign: true,
reqTimeout: true,
@@ -179,9 +190,11 @@
})
const signTypes = ref([])
const merchantNotifyTypes = ref([])
+ const mchNoOptions = ref([])
// 校验
const rules = reactive({
+ mchNo: [{ required: true, message: '请选择所属商户' }],
appName: [{ required: true, message: '请输入应用名称' }],
signType: [{ required: true, message: '请选择签名方式' }],
status: [{ required: true, message: '请选择应用状态' }],
@@ -189,7 +202,6 @@
reqSign: [{ required: true, message: '请选择是否验签' }],
reqTimeout: [{ required: true, message: '请选择是否校验请求超时' }],
reqTimeoutSecond: [{ required: true, message: '请输入请求超时时间(秒)' }],
- limitAmount: [{ required: true, message: '请输入支付限额(元)' }],
orderTimeout: [{ required: true, message: '请输入订单默认超时时间(分钟)' }],
notifyType: [{ required: true, message: '请选择消息通知方式' }],
} as Record)
@@ -207,9 +219,13 @@
}
/**
- * 初始化信息
+ * 初始化商户列表信息
*/
function initData() {
+ // 商户
+ merchantDropdown().then(({ data }) => {
+ mchNoOptions.value = data
+ })
// 签名方式
dictDropDown('sign_type').then((data) => {
signTypes.value = data
@@ -231,7 +247,7 @@
confirmLoading.value = false
})
} else if (editType === FormEditType.Add) {
- genSignSecret()
+ nextTick(() => (form.value.signSecret = buildUUID() + buildUUID()))
confirmLoading.value = false
}
}
@@ -253,7 +269,15 @@
* 生成秘钥
*/
function genSignSecret() {
- form.value.signSecret = buildUUID() + buildUUID()
+ createConfirm({
+ iconType: 'info',
+ title: '提示？',
+ content: '请确认是否重新生成签名秘钥吗？',
+ onOk: () => {
+ // 预防重新打开添加时不会生成新的密钥
+ nextTick(() => (form.value.signSecret = buildUUID() + buildUUID()))
+ },
+ })
}
/**
* 重置表单的校验
diff --git a/src/views/daxpay/admin/merchant/app/MchAppAdminList.vue b/src/views/daxpay/admin/merchant/app/MchAppAdminList.vue
index 8de97826..efafe578 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppAdminList.vue
+++ b/src/views/daxpay/admin/merchant/app/MchAppAdminList.vue
@@ -48,8 +48,8 @@
{{ dictConvert('merchant_notify_type', row.notifyType) || '空' }}
-
编辑
@@ -63,15 +63,9 @@
订阅配置
-
- 分账配置
-
网关支付
-
- 收款终端
-
删除
@@ -93,8 +87,6 @@
@@ -107,17 +99,17 @@
import useTablePage from '@/hooks/bootx/useTablePage'
import MchAppAdminEdit from './MchAppAdminEdit.vue'
import BQuery from '@/components/Bootx/Query/BQuery.vue'
- import { QueryField, STRING } from '@/components/Bootx/Query/Query'
+ import { LIST, QueryField, STRING } from '@/components/Bootx/Query/Query'
import { FormEditType } from '@/enums/formTypeEnum'
import { useMessage } from '@/hooks/web/useMessage'
import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
import ALink from '@/components/Link/Link.vue'
import { useDict } from '@/hooks/bootx/useDict'
+ import { dropdown as merchantDropdown } from '@/views/daxpay/common/assist/basic/MerchantQuery.api'
+ import { LabeledValue } from 'ant-design-vue/lib/select'
import ChannelConfigList from '@/views/daxpay/common/merchant/config/ChannelConfigList.vue'
import MerchantNotifyConfigList from '@/views/daxpay/common/merchant/notify/MerchantNotifyConfigList.vue'
import Icon from '@/components/Icon/Icon.vue'
- import AllocationConfigModel from '@/views/daxpay/common/allocation/AllocationConfigModel.vue'
- import TerminalDeviceList from '@/views/daxpay/common/assist/terminal/TerminalDeviceList.vue'
import GatewayConfigModel from '@/views/daxpay/common/merchant/gateway/GatewayConfigModel.vue'
// 使用hooks
@@ -136,17 +128,24 @@
// 查询条件
const fields = computed(() => {
return [
+ {
+ field: 'mchNo',
+ type: LIST,
+ name: '商户',
+ selectList: mchNoOptions.value,
+ placeholder: '请选择商户',
+ },
{ field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
{ field: 'appName', type: STRING, name: '应用名称', placeholder: '请输入应用名称' },
] as QueryField[]
})
+ const mchNoOptions = ref
+
+
+
+
diff --git a/src/views/daxpay/admin/isv/config/IsvChannelConfig.api.ts b/src/views/daxpay/admin/isv/config/IsvChannelConfig.api.ts
new file mode 100644
index 00000000..9379ed99
--- /dev/null
+++ b/src/views/daxpay/admin/isv/config/IsvChannelConfig.api.ts
@@ -0,0 +1,27 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 配置列表
+ */
+export function findAll() {
+ return defHttp.get
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/isv/gateway/GatewayConfig.api.ts b/src/views/daxpay/admin/isv/gateway/GatewayConfig.api.ts
new file mode 100644
index 00000000..509a58c8
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/GatewayConfig.api.ts
@@ -0,0 +1,54 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 获取网关支付配置
+ */
+export function getConfig() {
+ return defHttp.get
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/isv/gateway/aggregate/Aggregate.api.ts b/src/views/daxpay/admin/isv/gateway/aggregate/Aggregate.api.ts
new file mode 100644
index 00000000..f3ac7fa4
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/aggregate/Aggregate.api.ts
@@ -0,0 +1,194 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 获取聚合支付配置(列表)
+ */
+export function getAggregateConfigs() {
+ return defHttp.get
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新建
+
+
+
+
+
+
+ {{
+ dictConvert('aggregate_bar_pay_type', row.barPayType)
+ }}
+
+
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+
+
+
+ {{ dictConvert(`${row.channel}_method`, row.otherMethod) }}
+
+
+ {{ dictConvert('pay_method', row.payMethod) }}
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/isv/gateway/aggregate/AggregateConfigEdit.vue b/src/views/daxpay/admin/isv/gateway/aggregate/AggregateConfigEdit.vue
new file mode 100644
index 00000000..f3f7b303
--- /dev/null
+++ b/src/views/daxpay/admin/isv/gateway/aggregate/AggregateConfigEdit.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+ 新建
+ 创建默认分组
+
+
+
+
+
+
+ {{ row.name }}
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/merchant/gateway/codeCard/CodeCardTypeConfigEdit.vue b/src/views/daxpay/admin/isv/gateway/cashier/CashierItemConfigEdit.vue
similarity index 54%
rename from src/views/daxpay/common/merchant/gateway/codeCard/CodeCardTypeConfigEdit.vue
rename to src/views/daxpay/admin/isv/gateway/cashier/CashierItemConfigEdit.vue
index d715137c..7e0816f6 100644
--- a/src/views/daxpay/common/merchant/gateway/codeCard/CodeCardTypeConfigEdit.vue
+++ b/src/views/daxpay/admin/isv/gateway/cashier/CashierItemConfigEdit.vue
@@ -20,13 +20,40 @@
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/merchant/user/MerchantUser.api.ts b/src/views/daxpay/admin/merchant/user/MerchantUser.api.ts
new file mode 100644
index 00000000..6dd1995d
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/user/MerchantUser.api.ts
@@ -0,0 +1,99 @@
+import { defHttp } from '@/utils/http/axios'
+import { PageResult, Result } from '#/axios'
+import { UserInfo } from '@/views/iam/user/User.api'
+import { MchEntity } from '#/web'
+
+/**
+ * 用户列表
+ */
+export function page(params) {
+ return defHttp.get
+
+
+
+
+
+ 新建
+
+
+
+
+
+
+
+
+ {{ row.mchName }}
+
+
+
+
+ 启用
+ 禁用
+
+
+
+
+ 查看信息
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/merchant/user/UserEdit.vue b/src/views/daxpay/admin/merchant/user/UserEdit.vue
new file mode 100644
index 00000000..1ccf05dd
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/user/UserEdit.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue b/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue
deleted file mode 100644
index e5af17b4..00000000
--- a/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
-
-
- 新建
-
-
-
-
-
-
-
-
- {{ row.groupNo }}
-
-
-
-
- {{ dictConvert('channel', row.channel) }}
-
-
-
- {{ row.totalRate }}%
-
-
-
- 是
- 否
-
-
-
-
- 接收方配置
-
- 更多
-
- 设为默认
-
-
- 取消默认
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-
-
-
- {{ row.rate }}%
-
-
- {{ row.amount }} 元
-
-
-
- {{ dictConvert('alloc_detail_result', row.result) }}
-
-
-
- {{ row.errorMsg }}
-
-
- {{ row.finishTime }}
-
-
-
-
- 查看
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
deleted file mode 100644
index d6f4944a..00000000
--- a/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { PageResult, Result } from '#/axios'
-import { MchEntity } from '#/web'
-
-/**
- * 分页
- */
-export function page(params) {
- return defHttp.get
-
-
-
-
-
-
-
-
- {{ row.allocNo }}
-
-
-
-
-
-
- {{ row.orderNo }}
-
-
-
-
-
-
- {{ dictConvert('channel', row.channel) }}
-
-
-
-
- {{ row.amount }}
-
-
-
-
- {{ dictConvert('allocation_status', row.status) }}
-
-
-
-
- {{ dictConvert('allocation_result', row.result) }}
-
-
- 查看
- 明细列表
-
-
- 更多
-
-
- 重试
-
-
- 同步
-
-
- 完结
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverSelect.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverSelect.vue
deleted file mode 100644
index 9ddb7d94..00000000
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverSelect.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
-
- {{ row.receiverNo }}
-
-
-
-
- {{ dictConvert('channel', row.channel) }}
-
-
-
-
- {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/channel/hkrt/config/isv/HkrtIsvConfig.api.ts b/src/views/daxpay/common/channel/hkrt/config/isv/HkrtIsvConfig.api.ts
new file mode 100644
index 00000000..a4a9e13b
--- /dev/null
+++ b/src/views/daxpay/common/channel/hkrt/config/isv/HkrtIsvConfig.api.ts
@@ -0,0 +1,60 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+ return defHttp.get
-
-
-
-
-
- 新建绑定
-
-
-
-
-
-
-
-
- {{ row.receiverAccount }}
-
-
-
-
- {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-
-
-
-
- 服务商
- 直联
-
-
-
-
- 解绑 绑定
-
-
-
- {{ row.relationName }}
-
-
- {{ dictConvert('alloc_relation_type', row.relationType) }}
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/develop/auth/ChannelAuth.api.ts b/src/views/daxpay/common/develop/auth/ChannelAuth.api.ts
index 3d6e09c0..29bba953 100644
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.api.ts
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.api.ts
@@ -40,8 +40,10 @@ export interface AuthUrlResult {
export interface GenerateAuthUrlParam extends MchEntity {
// 通道
channel?: string
- // 自定义授权重定向地址
- authRedirectUrl?: string
+ // 认证类型
+ authType?: string
+ // 授权认证路径
+ authPath?: string
}
/**
diff --git a/src/views/daxpay/common/develop/auth/ChannelAuth.vue b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
index 10649ef0..efe44a07 100644
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.vue
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
@@ -11,7 +11,17 @@
>
-
-
-
-
-
- 新建绑定
-
-
-
-
-
-
-
-
- {{ row.receiverAccount }}
-
-
-
-
- {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-
-
-
-
- 服务商
- 直联
-
-
-
-
- 解绑 绑定
-
-
-
- {{ row.relationName }}
-
-
- {{ dictConvert('alloc_relation_type', row.relationType) }}
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/device/terminal/AssistAgentModel.vue b/src/views/daxpay/common/device/terminal/AssistAgentModel.vue
new file mode 100644
index 00000000..74f4738f
--- /dev/null
+++ b/src/views/daxpay/common/device/terminal/AssistAgentModel.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+ 生成码牌
+
+ 批量操作
+
+
+
+ 代理商划拨
+
+
+ 代理商回收
+
+
+ 商户应用绑定
+
+
+ 商户应用解绑
+
+
+ 应用绑定
+
+
+ 应用解绑
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.code }}
+
+
+
+ {{ row.name || '未命名' }}
+
+
+
+
+ {{ row.amountType === 'fixed' ? '固定金额' : '任意金额' }}
+
+
+
+
+
+
+ {{ row.enable ? '开启' : '关闭' }}
+
+
+
+
+
+ {{ row.agentName }}
+
+
+
+
+ {{ row.mchName || '未绑定' }}
+
+
+
+
+ {{ row.appName || '未绑定' }}
+
+
+
+
+ 编辑
+ 预览
+ 删除
+
+
+
+
+
@@ -33,9 +53,11 @@
ref="xTable"
:data="pagination.records"
:loading="loading"
+ @checkbox-all="selectAllEvent"
+ @checkbox-change="selectChangeEvent"
@sort-change="sortChange"
>
-
@@ -55,12 +77,28 @@
{{ row.gps ? '支持' : '不支持' }}
-
+
+
+ {{ row.agentName }}
+
+
+
+
+ {{ row.mchName || '未绑定' }}
+
+
+
+
+ {{ row.appName || '未绑定' }}
+
+
+
编辑
通道报送
+ 删除
@@ -76,12 +114,16 @@
/>
+
+
+
+
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+
+
+
+ {{ dictConvert('terminal_type', row.type) }}
+
+
+
+
+ {{ dictConvert('channel_terminal_status', row.status) || '未创建' }}
+
+
+
+
+
+ 报送
+ 注销
+ 生成配置
+
+ 信息修改
+ 信息同步
+
+
+
+
+
+
-
-
- 保存码牌
- 复制地址
-
-
+
+
+
+
+
+
diff --git a/src/views/daxpay/merchant/dashboard/IndexRepot.api.ts b/src/views/daxpay/merchant/dashboard/IndexRepot.api.ts
new file mode 100644
index 00000000..f1eea00a
--- /dev/null
+++ b/src/views/daxpay/merchant/dashboard/IndexRepot.api.ts
@@ -0,0 +1,107 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+
+/**
+ * 获取商户信息
+ */
+export function getShopInfo() {
+ return defHttp.get
+
+ 我的应用
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.appName }}
+ 修改
+ 应用ID: {{ item.appId }}
+
+
+ {{ dictConvert('mch_app_status', item.status) || '空' }}
+ 通道配置
+
+
+ 更多
+
+ 订阅配置
+
+
+ 网关支付
+
+
+ 删除
+
+
+
+
+
+ 
+ 添加新应用
+
+
+ 添加新应用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/merchant/dashboard/components/SiteAnalysis.vue b/src/views/daxpay/merchant/dashboard/components/SiteAnalysis.vue
new file mode 100644
index 00000000..2a78de59
--- /dev/null
+++ b/src/views/daxpay/merchant/dashboard/components/SiteAnalysis.vue
@@ -0,0 +1,44 @@
+
+
+
+
+ 
+
+
+
+
+ {{ infoData.mchName }}
+
+
+ 商户编号：{{ infoData.mchNo || '暂无配置' }}
+
+ 状态：{{
+ infoData.status === MerchantStatusEnum.ENABLED ? '启用' : '禁用'
+ }}
+
+
+
+
+
+ 支付订单
+
+
+
+
+
+
+
+ 订单数量
+
+
+
+
+
+
+
+ 订单金额
+
+
+
+
+
+
+
+ 平均单笔金额
+
+
+
+
+
+
+
+ 最大单笔金额
+
+
+
+
+ 退款订单
+
+
+
+
+
+
+ 订单数量
+
+
+
+
+
+
+
+
+
+
+ 订单金额
+
+
+
+
+
+
+
+
+
+
+
+
+ 平均单笔金额
+
+
+
+
+
+
+
+ 最大单笔金额
+
+
+
+
+
+
+
+
+ 通知公告
+
+
+
+
+ 公告{{ item }}
+ 2025-06-01
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/merchant/dashboard/index.vue b/src/views/daxpay/merchant/dashboard/index.vue
new file mode 100644
index 00000000..e790e6be
--- /dev/null
+++ b/src/views/daxpay/merchant/dashboard/index.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+ 支付通道
+
+
+
+
+
+ 支付方式
+
+
+
+
+
+
+ 退款通道
+
+
+ 交易统计
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/merchant/info/MerchantInfo.api.ts b/src/views/daxpay/merchant/info/MerchantInfo.api.ts
new file mode 100644
index 00000000..ef69b22b
--- /dev/null
+++ b/src/views/daxpay/merchant/info/MerchantInfo.api.ts
@@ -0,0 +1,22 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { Merchant } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+
+/**
+ * 获取商户信息
+ */
+export const get = () => {
+ return defHttp.get
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue
index 863d7a15..d9a8a17c 100644
--- a/src/views/sys/login/Login.vue
+++ b/src/views/sys/login/Login.vue
@@ -18,7 +18,7 @@
支付系统
+
+
+
+
+
+ {{ form.mchName }}
+
+
+
+
+ {{ form.mchNo }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 更新
+ 编辑信息
+
+
+
+
+
+ 支持聚合支付、分账、商户进件、代理商、商户管理等功能
+ >支持聚合支付、服务商模式等功能