+
-
-
-
-
- {{ row.groupNo }}
-
-
-
-
-
- {{ dictConvert('channel', row.channel) }}
-
-
-
- {{ row.totalRate }}%
-
-
-
- 是
- 否
-
-
-
-
-
- 接收方配置
-
-
- 更多
-
-
-
- 设为默认
-
-
- 取消默认
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ row.groupNo }}
+
+
+
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+
+ {{ row.totalRate }}%
+
+
+
+ 是
+ 否
+
+
+
+
+
+ 接收方配置
+
+
+ 更多
+
+
+
+ 设为默认
+
+
+ 取消默认
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue b/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue
index 39f4a4769ad1e299f807bfdb2edc0f234da683d8..e5ff0d622856d730ab80b0eb578bd15faea3aa98 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue
@@ -28,6 +28,7 @@
>
+
{{ dictConvert('alloc_receiver_type', row.receiverType) }}
@@ -86,6 +87,7 @@
const fields = computed(() => {
return [
{ field: 'receiverNo', type: STRING, name: '接收方编号', placeholder: '请输入接收方编号' },
+ { field: 'name', type: STRING, name: '接收方名称', placeholder: '请输入接收方名称' },
{
field: 'relationType',
type: LIST,
diff --git a/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue b/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue
new file mode 100644
index 0000000000000000000000000000000000000000..bcb44a2f7745b4fb1c9bb0c96aa81dcc36c73d46
--- /dev/null
+++ b/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+ {{ 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
new file mode 100644
index 0000000000000000000000000000000000000000..28280a20d94f4c06c403245a4248dab02712692d
--- /dev/null
+++ b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ dictConvert('alloc_receiver_type', row.receiverType) }}
+
+
+
+ {{ row.rate }}%
+
+
+ {{ row.amount }} 元
+
+
+
+ {{ dictConvert('alloc_detail_result', row.result) }}
+
+
+
+ {{ row.errorMsg }}
+
+
+ {{ row.finishTime }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/config/checkout/CheckoutAggregateConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d086ed6200fc9a977d6b9bb9a14b3ec42ff2b3ff
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts b/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ec0690d120e70a1ee816b3bc3a713ec6859521f8
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts
@@ -0,0 +1,279 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 获取收银台配置
+ */
+export function getConfig(appId) {
+ return defHttp.get
>({
+ url: '/checkout/config/get',
+ params: {
+ appId,
+ },
+ })
+}
+
+/**
+ * 保存收银台配置
+ */
+export function saveConfig(data: CheckoutConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/save',
+ data,
+ })
+}
+
+/**
+ * 更新收银台配置
+ */
+export function updateConfig(data: CheckoutConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/update',
+ data,
+ })
+}
+
+/**
+ * 获取分组配置列表
+ */
+export function getGroupConfigs(appId, checkoutType) {
+ return defHttp.get>({
+ url: '/checkout/config/group/list',
+ params: {
+ appId,
+ checkoutType,
+ },
+ })
+}
+
+/**
+ * 获取分组配置列表
+ */
+export function getGroupConfig(id) {
+ return defHttp.get>({
+ url: '/checkout/config/group/get',
+ params: { id },
+ })
+}
+
+/**
+ * 保存分组配置
+ */
+export function saveGroupConfig(data: CheckoutGroupConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/group/save',
+ data,
+ })
+}
+
+/**
+ * 更新分组配置
+ */
+export function updateGroupConfig(data: CheckoutGroupConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/group/update',
+ data,
+ })
+}
+
+/**
+ * 删除分组配置
+ */
+export function delGroupConfig(id) {
+ return defHttp.post({
+ url: '/checkout/config/group/delete',
+ params: { id },
+ })
+}
+
+/**
+ * 获取配置项配置
+ */
+export function getItemConfigs(groupId) {
+ return defHttp.get>({
+ url: '/checkout/config/item/list',
+ params: {
+ groupId,
+ },
+ })
+}
+/**
+ * 获取配置项配置
+ */
+export function getItemConfig(id) {
+ return defHttp.get>({
+ url: '/checkout/config/item/get',
+ params: {
+ id,
+ },
+ })
+}
+
+/**
+ * 保存配置项配置
+ */
+export function saveItemConfig(data: CheckoutItemConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/item/save',
+ data,
+ })
+}
+
+/**
+ * 更新配置项配置
+ */
+export function updateItemConfig(data: CheckoutItemConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/item/update',
+ data,
+ })
+}
+
+/**
+ * 删除配置项配置
+ */
+export function delItemConfig(id) {
+ return defHttp.post({
+ url: '/checkout/config/item/delete',
+ params: { id },
+ })
+}
+
+/**
+ * 获取聚合支付配置
+ */
+export function getAggregateConfigs(appId) {
+ return defHttp.get>({
+ url: '/checkout/config/aggregate/list',
+ params: {
+ appId,
+ },
+ })
+}
+
+/**
+ * 获取聚合支付配置
+ */
+export function getAggregateConfig(id) {
+ return defHttp.get>({
+ url: '/checkout/config/aggregate/get',
+ params: {
+ id,
+ },
+ })
+}
+
+/**
+ * 聚合支付配置是否存在
+ */
+export function existsAggregateConfig(appId, type) {
+ return defHttp.get>({
+ url: '/checkout/config/aggregate/exists',
+ params: {
+ appId,
+ type
+ },
+ })
+}
+
+/**
+ * 聚合支付配置是否存在(不包含自身)
+ */
+export function existsAggregateConfigNotId(appId, type, id) {
+ return defHttp.get>({
+ url: '/checkout/config/aggregate/existsNotId',
+ params: {
+ appId,
+ type,
+ id,
+ },
+ })
+}
+
+/**
+ * 保存聚合支付配置
+ */
+export function saveAggregateConfig(data: CheckoutAggregateConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/aggregate/save',
+ data,
+ })
+}
+
+/**
+ * 更新聚合支付配置
+ */
+export function updateAggregateConfig(data: CheckoutAggregateConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/aggregate/update',
+ data,
+ })
+}
+
+/**
+ * 删除聚合支付配置
+ */
+export function delAggregateConfig(id) {
+ return defHttp.post({
+ url: '/checkout/config/aggregate/delete',
+ params: { id },
+ })
+}
+
+/**
+ * 收银台配置
+ */
+export interface CheckoutConfig extends MchEntity {
+ /** 收银台名称 */
+ name?: string
+ /** PC收银台是否同时显示聚合收银码 */
+ aggregateShow?: boolean
+ /** h5收银台自动升级聚合支付 */
+ h5AutoUpgrade?: boolean
+}
+/**
+ * 收银台类目配置
+ */
+export interface CheckoutGroupConfig extends MchEntity {
+ /** 类型 web/h5/小程序 */
+ type?: string
+ /** 名称 */
+ name?: string
+ /** 图标 */
+ icon?: string
+ /** 排序 */
+ sortNo?: number
+}
+/**
+ * 收银台配置项
+ */
+export interface CheckoutItemConfig extends MchEntity {
+ /** 类目配置Id */
+ groupId?: string
+ /** 名称 */
+ name?: string
+ /** 图标 */
+ icon?: string
+ /** 排序 */
+ sortNo?: number
+ /** 发起调用的类型 */
+ callType?: string
+ /** 支付通道 */
+ channel?: string
+ /** 支付方式 */
+ payMethod?: string
+}
+/**
+ * 收银台聚合扫码支付配置
+ */
+export interface CheckoutAggregateConfig extends MchEntity {
+ /** 支付类型 */
+ type?: string
+ /** 通道 */
+ channel?: string
+ /** 支付方式 */
+ payMethod?: string
+ /** 自动拉起支付 */
+ autoLaunch?: boolean
+}
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a9dba1deac55b5a5320fd8d01434fff26e87e9da
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+ 不显示
+ 显示
+
+
+
+
+ 不升级
+ 升级
+
+
+
+
+ 取消
+ {{
+ form.id ? '更新' : '保存'
+ }}
+ 编辑信息
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4bb99960b25ba4905daa0d738cc8b7b1d44a622c
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5f86497b6a19c75d0398d662157c21d950165f99
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a999f87219973bf2921348d638a923e9984e05c1
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..52c0949c515f4a5ee67c1ae7d247e1a8a04b2dc6
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1aeaa2a987ae5782b1dc7f3bae0019f006873186
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+ 新建
+
+
+
+
+
+
+
+
+ {{ dictConvert('checkout_call_type', row.callType) }}
+
+
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+
+
+ {{ dictConvert('pay_method', row.payMethod) }}
+
+
+
+
+
+
+ 查看
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/constant/channel/ChannelConstList.vue b/src/views/daxpay/common/constant/channel/ChannelConstList.vue
index 14bc878a9f75e1c106400bd736b9da5dc15db9bf..1ae5a032e140a0e8d0ad2a658703fe5f7bf8a645 100644
--- a/src/views/daxpay/common/constant/channel/ChannelConstList.vue
+++ b/src/views/daxpay/common/constant/channel/ChannelConstList.vue
@@ -27,6 +27,12 @@
停用
+
+
+ 支持
+ 不支持
+
+
diff --git a/src/views/daxpay/common/develop/auth/ChannelAuth.vue b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
index 9c929a4c42ab7246c00d6a28b4a07bbe6c63430d..108044f07acdcf0ef0ee94c2faa706898c4b4e80 100644
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.vue
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
@@ -83,7 +83,7 @@
import useFormEdit from '@/hooks/bootx/useFormEdit'
import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
import { useDict } from '@/hooks/bootx/useDict'
- import { ChannelAuthStatusEnum } from '@/enums/daxpay/daxpayEnum'
+ import { ChannelAuthStatusEnum } from '@/enums/daxpay/channelEnum'
const { createMessage } = useMessage()
const { dictDropDown } = useDict()
diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
index 72a5ba04ae7cbd4479aa6d4c5a7575f92ea7b3d8..a8534be98976661c10285bf0cc0fdafdb0d550b0 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
+++ b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
@@ -43,6 +43,20 @@ export function tradeTransfer(params) {
return defHttp.post