1

build/cool/temp/eps.d.ts

@@ -351,57 +351,6 @@ declare namespace Eps {
 		[key: string]: any;
 	}
 
-	interface AccountEntity {
-		/**
-		 * ID
-		 */
-		id?: number;
-		/**
-		 * APP_ID
-		 */
-		appId?: string;
-		/**
-		 * 密钥
-		 */
-		key?: string;
-		/**
-		 * 私钥
-		 */
-		privateKey?: string;
-		/**
-		 * 公钥
-		 */
-		publicKey?: string;
-		/**
-		 * 状态 0-禁用 1-启用
-		 */
-		status?: number;
-		/**
-		 * 权重
-		 */
-		weight?: number;
-		/**
-		 * 备注
-		 */
-		remark?: string;
-		/**
-		 * SMID
-		 */
-		smid?: string;
-		/**
-		 * 创建时间
-		 */
-		createTime?: Date;
-		/**
-		 * 更新时间
-		 */
-		updateTime?: Date;
-		/**
-		 * 任意键值
-		 */
-		[key: string]: any;
-	}
-
 	interface BalanceEntity {
 		/**
 		 * ID
@@ -578,6 +527,53 @@ declare namespace Eps {
 		[key: string]: any;
 	}
 
+	interface KycEntity {
+		/**
+		 * ID
+		 */
+		id?: number;
+		/**
+		 * 商户号
+		 */
+		mchId?: string;
+		/**
+		 * 用户ID
+		 */
+		userId?: string;
+		/**
+		 * 通道码
+		 */
+		code?: string;
+		/**
+		 * 平台用户ID
+		 */
+		kycUserId?: string;
+		/**
+		 * KYC_ID
+		 */
+		customerId?: string;
+		/**
+		 * KYC_Level
+		 */
+		level?: string;
+		/**
+		 * 备注
+		 */
+		remark?: string;
+		/**
+		 * 创建时间
+		 */
+		createTime?: Date;
+		/**
+		 * 更新时间
+		 */
+		updateTime?: Date;
+		/**
+		 * 任意键值
+		 */
+		[key: string]: any;
+	}
+
 	interface MchBalanceEntity {
 		/**
 		 * ID
@@ -685,10 +681,6 @@ declare namespace Eps {
 		 * 用户IP
 		 */
 		userIp?: string;
-		/**
-		 * 交易账号
-		 */
-		mainId?: string;
 		/**
 		 * 金额
 		 */
@@ -721,22 +713,14 @@ declare namespace Eps {
 		 * 订单状态 0-未通知 1 已通知 2 通知失败
 		 */
 		notifyStatus?: number;
-		/**
-		 * 结算状态 0-未结算 1 已确认 2 已结算
-		 */
-		settleStatus?: number;
 		/**
 		 * 备注
 		 */
 		remark?: string;
 		/**
-		 * 结算订单号
-		 */
-		settleNo?: string;
-		/**
-		 * 支付表单
+		 * 支付地址
 		 */
-		form?: string;
+		payUrl?: string;
 		/**
 		 * 创建时间
 		 */
@@ -1953,63 +1937,6 @@ declare namespace Eps {
 		request: Service["request"];
 	}
 
-	interface DjAccount {
-		/**
-		 * 删除
-		 */
-		delete(data?: any): Promise<any>;
-		/**
-		 * 修改
-		 */
-		update(data?: any): Promise<any>;
-		/**
-		 * 单个信息
-		 */
-		info(data?: any): Promise<AccountEntity>;
-		/**
-		 * 分页查询
-		 */
-		page(data?: any): Promise<{
-			pagination: { size: number; page: number; total: number };
-			list: AccountEntity[];
-			[key: string]: any;
-		}>;
-		/**
-		 * 列表查询
-		 */
-		list(data?: any): Promise<AccountEntity[]>;
-		/**
-		 * 新增
-		 */
-		add(data?: any): Promise<any>;
-		/**
-		 * 权限标识
-		 */
-		permission: {
-			delete: string;
-			update: string;
-			info: string;
-			page: string;
-			list: string;
-			add: string;
-		};
-		/**
-		 * 权限状态
-		 */
-		_permission: {
-			delete: boolean;
-			update: boolean;
-			info: boolean;
-			page: boolean;
-			list: boolean;
-			add: boolean;
-		};
-		/**
-		 * 请求
-		 */
-		request: Service["request"];
-	}
-
 	interface DjBalance {
 		/**
 		 * 统计
@@ -2325,6 +2252,63 @@ declare namespace Eps {
 		request: Service["request"];
 	}
 
+	interface DjKyc {
+		/**
+		 * 删除
+		 */
+		delete(data?: any): Promise<any>;
+		/**
+		 * 修改
+		 */
+		update(data?: any): Promise<any>;
+		/**
+		 * 列表查询
+		 */
+		list(data?: any): Promise<KycEntity[]>;
+		/**
+		 * 单个信息
+		 */
+		info(data?: any): Promise<KycEntity>;
+		/**
+		 * 分页查询
+		 */
+		page(data?: any): Promise<{
+			pagination: { size: number; page: number; total: number };
+			list: KycEntity[];
+			[key: string]: any;
+		}>;
+		/**
+		 * 新增
+		 */
+		add(data?: any): Promise<any>;
+		/**
+		 * 权限标识
+		 */
+		permission: {
+			delete: string;
+			update: string;
+			list: string;
+			info: string;
+			page: string;
+			add: string;
+		};
+		/**
+		 * 权限状态
+		 */
+		_permission: {
+			delete: boolean;
+			update: boolean;
+			list: boolean;
+			info: boolean;
+			page: boolean;
+			add: boolean;
+		};
+		/**
+		 * 请求
+		 */
+		request: Service["request"];
+	}
+
 	interface DjMchBalance {
 		/**
 		 * 列表查询
@@ -2444,6 +2428,30 @@ declare namespace Eps {
 		 * 交易订单回调通知
 		 */
 		notifyOrder(data?: any): Promise<any>;
+		/**
+		 * kyc countries 查询
+		 */
+		countries(data?: any): Promise<any>;
+		/**
+		 * kyc advanced 保存
+		 */
+		advanced(data?: any): Promise<any>;
+		/**
+		 * kyc basic 保存
+		 */
+		premium(data?: any): Promise<any>;
+		/**
+		 * kyc level 查询
+		 */
+		level(data?: any): Promise<any>;
+		/**
+		 * kyc basic 保存
+		 */
+		basic(data?: any): Promise<any>;
+		/**
+		 * kyc topay
+		 */
+		toPay(data?: any): Promise<any>;
 		/**
 		 * 交易订单回调通知
 		 */
@@ -2460,10 +2468,6 @@ declare namespace Eps {
 		 * 代收查询
 		 */
 		query(data?: any): Promise<any>;
-		/**
-		 * 支付地址
-		 */
-		orderNo(data?: any): Promise<any>;
 		/**
 		 * list
 		 */
@@ -2497,11 +2501,16 @@ declare namespace Eps {
 		 */
 		permission: {
 			notifyOrder: string;
+			countries: string;
+			advanced: string;
+			premium: string;
+			level: string;
+			basic: string;
+			toPay: string;
 			notifyOrder: string;
 			notifyTest: string;
 			order: string;
 			query: string;
-			orderNo: string;
 			list: string;
 			page: string;
 			info: string;
@@ -2514,11 +2523,16 @@ declare namespace Eps {
 		 */
 		_permission: {
 			notifyOrder: boolean;
+			countries: boolean;
+			advanced: boolean;
+			premium: boolean;
+			level: boolean;
+			basic: boolean;
+			toPay: boolean;
 			notifyOrder: boolean;
 			notifyTest: boolean;
 			order: boolean;
 			query: boolean;
-			orderNo: boolean;
 			list: boolean;
 			page: boolean;
 			info: boolean;
@@ -3028,12 +3042,12 @@ declare namespace Eps {
 		};
 		dict: { info: DictInfo; type: DictType };
 		dj: {
-			account: DjAccount;
 			balance: DjBalance;
 			bank: DjBank;
 			bill: DjBill;
 			channel: DjChannel;
 			comm: DjComm;
+			kyc: DjKyc;
 			mchBalance: DjMchBalance;
 			merchant: DjMerchant;
 			open: DjOpen;

index.html

@@ -146,7 +146,7 @@
 <body>
 	<div class="preload__wrap" id="Loading">
 		<div class="preload__container">
-			<p class="preload__name">DJ-ADMIN</p>
+			<p class="preload__name">FusionPay-ADMIN</p>
 			<div class="preload__loading"></div>
 			<p class="preload__title">正在加载资源...</p>
 			<p class="preload__sub-title">初次加载资源可能需要较多时间 请耐心等待</p>

src/cool/config/index.ts

@@ -9,7 +9,7 @@ export const isDev = import.meta.env.MODE === "development";
 export const config: Config = {
 	// 项目信息
 	app: {
-		name: "DJ-ADMIN",
+		name: "FUSION-ADMIN",
 
 		// 菜单
 		menu: {

src/main.ts

@@ -10,5 +10,5 @@ bootstrap(app)
 		app.mount("#app");
 	})
 	.catch((err) => {
-		console.error("DJ-ADMIN 启动失败", err);
+		console.error("FusionPay-ADMIN 启动失败", err);
 	});

src/modules/dj/views/account.vue

@@ -1,96 +0,0 @@
-<template>
-	<cl-crud ref="Crud">
-		<cl-row>
-			<!-- 刷新按钮 -->
-			<cl-refresh-btn />
-			<!-- 新增按钮 -->
-			<cl-add-btn />
-			<!-- 删除按钮 -->
-			<cl-multi-delete-btn />
-			<cl-flex1 />
-			<!-- 关键字搜索 -->
-			<cl-search-key />
-		</cl-row>
-
-		<cl-row>
-			<!-- 数据表格 -->
-			<cl-table ref="Table" />
-		</cl-row>
-
-		<cl-row>
-			<cl-flex1 />
-			<!-- 分页控件 -->
-			<cl-pagination />
-		</cl-row>
-
-		<!-- 新增、编辑 -->
-		<cl-upsert ref="Upsert" />
-	</cl-crud>
-</template>
-
-<script lang="ts" name="dj-account" setup>
-import { useCrud, useTable, useUpsert } from "@cool-vue/crud";
-import { useCool } from "/@/cool";
-
-const { service } = useCool();
-
-// cl-upsert
-const Upsert = useUpsert({
-	items: [
-		{ prop: "appId", label: "APP_ID", required: true, component: { name: "el-input" } },
-		{ prop: "key", label: "密钥", component: { name: "el-input" } },
-		{
-			prop: "privateKey",
-			label: "私钥",
-			component: { name: "el-input", props: { type: "textarea", rows: 4 } }
-		},
-		{
-			prop: "publicKey",
-			label: "公钥",
-			component: { name: "el-input", props: { type: "textarea", rows: 4 } }
-		},
-		{ prop: "status", label: "状态", component: { name: "cl-switch" }, required: true },
-		{ prop: "weight", label: "权重", required: true, component: { name: "el-input" } },
-		{
-			prop: "smid",
-			label: "SMID",
-			component: { name: "el-input", props: { type: "textarea", rows: 4 } }
-		},
-		{
-			prop: "remark",
-			label: "备注",
-			component: { name: "el-input", props: { type: "textarea", rows: 4 } }
-		}
-	]
-});
-
-// cl-table
-const Table = useTable({
-	autoHeight: false,
-	columns: [
-		{ type: "selection" },
-		// { prop: "id", label: "ID" },
-		{ prop: "appId", label: "APP_ID" },
-		// { prop: "key", label: "密钥" },
-		// { prop: "publicKey", label: "公钥" },
-		// { prop: "privateKey", label: "私钥" },
-		{ prop: "status", label: "状态", component: { name: "cl-switch" } },
-		{ prop: "weight", label: "权重" },
-		{ prop: "smid", label: "SMID", showOverflowTooltip: true },
-		{ prop: "remark", label: "备注", showOverflowTooltip: true },
-		{ prop: "createTime", label: "创建时间", sortable: "desc", width: 160 },
-		// { prop: "updateTime", label: "更新时间", sortable: "custom", width: 160 },
-		{ type: "op", buttons: ["edit", "delete"] }
-	]
-});
-
-// cl-crud
-const Crud = useCrud(
-	{
-		service: service.dj.account
-	},
-	(app) => {
-		app.refresh();
-	}
-);
-</script>

src/modules/dj/views/kyc.vue

@@ -0,0 +1,84 @@
+<template>
+	<cl-crud ref="Crud">
+		<cl-row>
+			<!-- 刷新按钮 -->
+			<cl-refresh-btn />
+			<!-- 新增按钮 -->
+			<cl-add-btn />
+			<!-- 删除按钮 -->
+			<cl-multi-delete-btn />
+			<cl-flex1 />
+			<!-- 关键字搜索 -->
+			<cl-search-key />
+		</cl-row>
+
+		<cl-row>
+			<!-- 数据表格 -->
+			<cl-table ref="Table" />
+		</cl-row>
+
+		<cl-row>
+			<cl-flex1 />
+			<!-- 分页控件 -->
+			<cl-pagination />
+		</cl-row>
+
+		<!-- 新增、编辑 -->
+		<cl-upsert ref="Upsert" />
+	</cl-crud>
+</template>
+
+<script lang="ts" name="dj-kyc" setup>
+import { useCrud, useTable, useUpsert } from "@cool-vue/crud";
+import { useCool } from "/@/cool";
+
+const { service } = useCool();
+
+// cl-upsert
+const Upsert = useUpsert({
+	items: [
+		{ prop: "mchId", label: "商户号", required: true, component: { name: "el-input" } },
+		{ prop: "userId", label: "用户ID", required: true, component: { name: "el-input" } },
+		{ prop: "code", label: "通道码", required: true, component: { name: "el-input" } },
+		{ prop: "kycUserId", label: "平台用户ID", required: true, component: { name: "el-input" } },
+		{
+			prop: "customerId",
+			label: "KYC_ID",
+			required: true,
+			component: { name: "el-input" }
+		},
+		{ prop: "level", label: "KYC_Level", required: true, component: { name: "el-input" } },
+		{
+			prop: "remark",
+			label: "备注",
+			component: { name: "el-input", props: { type: "textarea", rows: 4 } }
+		}
+	]
+});
+
+// cl-table
+const Table = useTable({
+	columns: [
+		{ type: "selection" },
+		{ prop: "mchId", label: "商户号" },
+		{ prop: "userId", label: "用户ID" },
+		{ prop: "code", label: "通道码" },
+		{ prop: "kycUserId", label: "平台用户ID" },
+		{ prop: "customerId", label: "KYC_ID" },
+		{ prop: "level", label: "KYC_Level" },
+		{ prop: "remark", label: "备注", showOverflowTooltip: true },
+		{ prop: "createTime", label: "创建时间", sortable: "desc", width: 160 },
+		{ type: "op", buttons: ["edit", "delete"] }
+	]
+});
+
+// cl-crud
+const Crud = useCrud(
+	{
+		service: service.dj.kyc
+	},
+	(app) => {
+		app.refresh();
+	}
+);
+</script>

src/modules/dj/views/order.vue

@@ -7,32 +7,20 @@
 
 		<cl-row>
 			<el-checkbox v-model="showSummary" label="统计数据" size="small" />
-			<el-tag v-if="showSummary" class="ml-2" effect="light"
-				>成功总金额: {{ summary.num1 }}</el-tag
-			>
-			<el-tag v-if="showSummary" class="ml-2" effect="light"
-				>成功订单手续费: {{ summary.num2 }}</el-tag
-			>
-			<el-tag
-				v-if="showSummary && checkPerm(service.dj.order.permission.update)"
-				class="ml-2"
-				effect="light"
-				>通道手续费: {{ summary.num5.toFixed(2) }}</el-tag
-			>
-			<el-tag v-if="showSummary" class="ml-2" effect="light"
-				>成功订单数: {{ summary.num3 }}</el-tag
-			>
-			<el-tag v-if="showSummary" class="ml-2" effect="light"
-				>成功率: {{ summary.num4.toFixed(2) }}%</el-tag
-			>
+			<el-tag v-if="showSummary" class="ml-2" effect="light">成功总金额: {{ summary.num1 }}</el-tag>
+			<el-tag v-if="showSummary" class="ml-2" effect="light">成功订单手续费: {{ summary.num2 }}</el-tag>
+			<el-tag v-if="showSummary && checkPerm(service.dj.order.permission.update)" class="ml-2"
+				effect="light">通道手续费: {{ summary.num5.toFixed(2) }}</el-tag>
+			<el-tag v-if="showSummary" class="ml-2" effect="light">成功订单数: {{ summary.num3 }}</el-tag>
+			<el-tag v-if="showSummary" class="ml-2" effect="light">成功率: {{ summary.num4.toFixed(2) }}%</el-tag>
 		</cl-row>
 
 		<cl-row>
 			<!-- 数据表格 -->
 			<cl-table ref="Table" :contextMenu="[]">
 				<template #column-detail="{ scope }">
-					<div style="padding: 10px">
-						<el-descriptions border :column="4">
+					<div style="padding: 10px;">
+						<el-descriptions border :column="4" class="desc">
 							<el-descriptions-item :span="2" label="付款时间">
 								{{ scope.row.date }}
 							</el-descriptions-item>
@@ -51,6 +39,10 @@
 								{{ scope.row.returnUrl }}
 							</el-descriptions-item>
 
+							<el-descriptions-item :span="4" label="支付地址">
+								{{ scope.row.payUrl }}
+							</el-descriptions-item>
+
 							<el-descriptions-item :span="4" label="备注/失败描述">
 								{{ scope.row.remark }}
 							</el-descriptions-item>
@@ -128,19 +120,12 @@ const items = ref<ClForm.Item[]>([
 		}
 	},
 	{
-		label: "AppID",
-		prop: "mainId",
+		label: "通道编码",
+		prop: "code",
 		component: {
 			name: "el-input"
 		}
 	},
-	// {
-	// 	label: "通道编码",
-	// 	prop: "code",
-	// 	component: {
-	// 		name: "el-input"
-	// 	}
-	// },
 	{
 		label: "支付状态",
 		prop: "status",
@@ -189,30 +174,6 @@ const items = ref<ClForm.Item[]>([
 			]
 		}
 	},
-	{
-		label: "结算状态",
-		prop: "settleStatus",
-		component: {
-			name: "el-select",
-			props: {
-				clearable: true
-			},
-			options: [
-				{
-					label: "未结算",
-					value: 0
-				},
-				{
-					label: "已确认",
-					value: 1
-				},
-				{
-					label: "已结算",
-					value: 2
-				}
-			]
-		}
-	},
 	{
 		label: "日期范围",
 		prop: "createTime",
@@ -223,7 +184,7 @@ const items = ref<ClForm.Item[]>([
 				type: "datetimerange",
 				unlinkPanels: true,
 				valueFormat: "YYYY-MM-DD HH:mm:ss",
-				onChange() {}
+				onChange() { }
 			}
 		}
 	}
@@ -315,7 +276,6 @@ const Table = useTable({
 		{ prop: "outOrderNo", label: "商户订单号" },
 		{ prop: "traceNo", label: "交易号" },
 		{ prop: "mchId", label: "商户号" },
-		{ prop: "mainId", label: "AppId" },
 		{ prop: "code", label: "通道编码" },
 		{
 			prop: "amount",
@@ -353,15 +313,6 @@ const Table = useTable({
 				{ label: "通知失败", value: 2, color: "#F56C6C" }
 			]
 		},
-		{
-			prop: "settleStatus",
-			label: "结算状态",
-			dict: [
-				{ label: "待结算", value: 0, color: "#909399" },
-				{ label: "已确认", value: 1, color: "#67C23A" },
-				{ label: "已结算", value: 2, color: "#4165d7" }
-			]
-		},
 		// { prop: "remark", label: "备注", showOverflowTooltip: true },
 		{
 			type: "op",
@@ -395,52 +346,6 @@ const Table = useTable({
 							}
 						});
 					}
-					if (+scope.row.settleStatus === 0) {
-						if (checkPerm(service.dj.order.permission.settle)) {
-							btns.push({
-								label: "确认结算",
-								type: "primary",
-								async onClick({ scope }: any) {
-									try {
-										const data = await service.dj.order.settle({
-											id: scope.row.id
-										});
-										if (+data.status === 1) {
-											ElMessage.success("确认结算成功");
-										} else {
-											ElMessage.warning("订单未结算，请稍后重试！");
-											Crud.value?.refresh();
-										}
-									} catch (e) {
-										ElMessage.warning("订单未结算，请稍后重试");
-									}
-								}
-							});
-						}
-					}
-					if (+scope.row.settleStatus === 1) {
-						if (checkPerm(service.dj.order.permission.settle)) {
-							btns.push({
-								label: "结算完结",
-								type: "primary",
-								async onClick({ scope }: any) {
-									try {
-										const data = await service.dj.order.settle({
-											id: scope.row.id
-										});
-										if (+data.status === 1) {
-											ElMessage.success("结算完结成功");
-										} else {
-											ElMessage.warning("订单未结算完结，请稍后重试！");
-											Crud.value?.refresh();
-										}
-									} catch (e) {
-										ElMessage.warning("订单未结算完结，请稍后重试");
-									}
-								}
-							});
-						}
-					}
 				} else {
 					if (checkPerm(service.dj.order.permission.query)) {
 						btns.push({
@@ -505,4 +410,8 @@ const Crud = useCrud(
 		}
 	}
 }
+
+.desc .el-descriptions__label {
+	min-width: 115px;
+}
 </style>

src/modules/dj/views/test.vue

@@ -80,7 +80,7 @@ const defaultForm = {
 	notifyUrl: "http://205.234.252.199/api/admin/dj/open/Alipay/notifyTest",
 	returnUrl: "https://www.baidu.com",
 	amount: 1,
-	payType: "Alipay",
+	payType: "SunCard",
 	userIp: "127.0.0.1",
 	userId: "test"
 };