1

build/cool/temp/eps.d.ts

@@ -713,6 +713,10 @@ declare namespace Eps {
 		 * 订单号
 		 */
 		orderNo?: string;
+		/**
+		 * 商户订单号
+		 */
+		outOrderNo?: string;
 		/**
 		 * 交易号
 		 */
@@ -730,9 +734,17 @@ declare namespace Eps {
 		 */
 		amount?: number;
 		/**
-		 * 账户
+		 * 货币单位
+		 */
+		currency?: string;
+		/**
+		 * 收款账号
 		 */
 		accountNo?: string;
+		/**
+		 * 收款人姓名
+		 */
+		accountName?: string;
 		/**
 		 * 银行编码
 		 */
@@ -742,11 +754,78 @@ declare namespace Eps {
 		 */
 		bankName?: string;
 		/**
-		 * 账户名
+		 * 通道手续费
 		 */
-		accountName?: string;
+		channelCharge?: number;
+		/**
+		 * 手续费
+		 */
+		charge?: number;
 		/**
-		 * 订单状态 0-处理中 1-代付成功 2-代付失败
+		 * 订单状态 1-已受理 2-银行处理中 3-失败 8-成功
+		 */
+		status?: boolean;
+		/**
+		 * 备注
+		 */
+		remark?: string;
+		/**
+		 * 创建时间
+		 */
+		createTime?: Date;
+		/**
+		 * 更新时间
+		 */
+		updateTime?: Date;
+		/**
+		 * 任意键值
+		 */
+		[key: string]: any;
+	}
+
+	interface WithdrawChannelEntity {
+		/**
+		 * ID
+		 */
+		id?: number;
+		/**
+		 * 通道名
+		 */
+		name?: string;
+		/**
+		 * 通道编码
+		 */
+		code?: string;
+		/**
+		 * 代码服务
+		 */
+		service?: string;
+		/**
+		 * 货币
+		 */
+		currency?: string;
+		/**
+		 * 费率
+		 */
+		rate?: string;
+		/**
+		 * 单笔固定费用
+		 */
+		basicFee?: number;
+		/**
+		 * 单笔最低费用
+		 */
+		feeMin?: number;
+		/**
+		 * 单笔最大
+		 */
+		max?: number;
+		/**
+		 * 单笔最小
+		 */
+		min?: number;
+		/**
+		 * 状态 0-未启用 1 启用
 		 */
 		status?: boolean;
 		/**
@@ -2027,10 +2106,6 @@ declare namespace Eps {
 	}
 
 	interface DjChannel {
-		/**
-		 * 获取通道余额
-		 */
-		queryChannelBalance(data?: any): Promise<any>;
 		/**
 		 * 删除
 		 */
@@ -2063,7 +2138,6 @@ declare namespace Eps {
 		 * 权限标识
 		 */
 		permission: {
-			queryChannelBalance: string;
 			delete: string;
 			update: string;
 			list: string;
@@ -2075,7 +2149,6 @@ declare namespace Eps {
 		 * 权限状态
 		 */
 		_permission: {
-			queryChannelBalance: boolean;
 			delete: boolean;
 			update: boolean;
 			list: boolean;
@@ -2541,7 +2614,7 @@ declare namespace Eps {
 
 	interface DjWithdraw {
 		/**
-		 * 查单
+		 * 发起代付
 		 */
 		withdraw(data?: any): Promise<any>;
 		/**
@@ -2608,6 +2681,69 @@ declare namespace Eps {
 		request: Service["request"];
 	}
 
+	interface DjWithdrawChannel {
+		/**
+		 * 获取通道余额
+		 */
+		queryChannelBalance(data?: any): Promise<any>;
+		/**
+		 * 删除
+		 */
+		delete(data?: any): Promise<any>;
+		/**
+		 * 修改
+		 */
+		update(data?: any): Promise<any>;
+		/**
+		 * 列表查询
+		 */
+		list(data?: any): Promise<WithdrawChannelEntity[]>;
+		/**
+		 * 单个信息
+		 */
+		info(data?: any): Promise<WithdrawChannelEntity>;
+		/**
+		 * 分页查询
+		 */
+		page(data?: any): Promise<{
+			pagination: { size: number; page: number; total: number };
+			list: WithdrawChannelEntity[];
+			[key: string]: any;
+		}>;
+		/**
+		 * 新增
+		 */
+		add(data?: any): Promise<any>;
+		/**
+		 * 权限标识
+		 */
+		permission: {
+			queryChannelBalance: string;
+			delete: string;
+			update: string;
+			list: string;
+			info: string;
+			page: string;
+			add: string;
+		};
+		/**
+		 * 权限状态
+		 */
+		_permission: {
+			queryChannelBalance: boolean;
+			delete: boolean;
+			update: boolean;
+			list: boolean;
+			info: boolean;
+			page: boolean;
+			add: boolean;
+		};
+		/**
+		 * 请求
+		 */
+		request: Service["request"];
+	}
+
 	interface PluginInfo {
 		/**
 		 * 安装插件
@@ -2964,6 +3100,7 @@ declare namespace Eps {
 			open: DjOpen;
 			order: DjOrder;
 			withdraw: DjWithdraw;
+			withdrawChannel: DjWithdrawChannel;
 		};
 		plugin: { info: PluginInfo };
 		recycle: { data: RecycleData };

src/modules/dj/views/channel.vue

@@ -17,11 +17,6 @@
 		<cl-row>
 			<!-- 数据表格 -->
 			<cl-table ref="Table" :contextMenu="[]">
-				<template #column-balance="{ scope }">
-					<el-link type="primary" @click="getBalanceByCode(scope.row)">{{
-						scope.row.balance || '查询'
-					}}</el-link>
-				</template>
 			</cl-table>
 		</cl-row>
 
@@ -133,15 +128,11 @@ const Table = useTable({
 		},
 		{
 			prop: "min",
-			label: "单边限额",
+			label: "单笔限额",
 			formatter(row) {
 				return "[" + +row.min + "," + +row.max + "]";
 			}
 		},
-		{
-			prop: "balance",
-			label: "通道余额",
-		},
 		{ prop: "status", label: "状态", component: { name: "cl-switch" } },
 		{ prop: "remark", label: "备注", showOverflowTooltip: true },
 		// { prop: "createTime", label: "创建时间", sortable: "desc", width: 160 },
@@ -158,15 +149,4 @@ const Crud = useCrud(
 		app.refresh();
 	}
 );
-
-const getBalanceByCode = async (row: any) => {
-	try {
-		const data = await service.dj.channel.queryChannelBalance({ code: row.code })
-		if (data) {
-			row.balance = data.balance;
-		}
-	} catch (e: any) {
-		ElMessage.error(e.message);
-	}
-}
 </script>

src/modules/dj/views/order.vue

@@ -199,6 +199,38 @@ const items = ref<ClForm.Item[]>([
 				type: "datetimerange",
 				unlinkPanels: true,
 				valueFormat: "YYYY-MM-DD HH:mm:ss",
+				shortcuts: [
+					{
+						text: '今天',
+						value: () => {
+							return [dayjs().startOf('day'), dayjs().endOf('day')]
+						}
+					},
+					{
+						text: '昨天',
+						value: () => {
+							return [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')]
+						}
+					},
+					{
+						text: '近三天',
+						value: () => {
+							return [dayjs().subtract(2, 'day').startOf('day'), dayjs().endOf('day')]
+						}
+					},
+					{
+						text: '近七天',
+						value: () => {
+							return [dayjs().subtract(6, 'day').startOf('day'), dayjs().endOf('day')]
+						}
+					},
+					{
+						text: '近一个月',
+						value: () => {
+							return [dayjs().startOf('month'), dayjs().endOf('month')]
+						}
+					},
+				],
 				onChange() { }
 			}
 		}

src/modules/dj/views/test.vue

@@ -90,7 +90,7 @@ const defaultForm = {
   notifyUrl: "http://157.175.73.225/api/admin/dj/open/notifyTest",
   returnUrl: "https://www.baidu.com",
   amount: 100,
-  payType: "SunCard",
+  payType: "",
   userIp: "127.0.0.1",
   userId: "test",
   currency: 'USD'