增加下单的额外信息保存

build/cool/temp/eps.d.ts

@@ -960,6 +960,33 @@ declare namespace Eps {
 		[key: string]: any;
 	}
 
+	interface OrderExtraEntity {
+		/**
+		 * ID
+		 */
+		id?: number;
+		/**
+		 * 订单号
+		 */
+		orderNo?: string;
+		/**
+		 * 额外信息
+		 */
+		info?: string;
+		/**
+		 * 创建时间
+		 */
+		createTime?: Date;
+		/**
+		 * 更新时间
+		 */
+		updateTime?: Date;
+		/**
+		 * 任意键值
+		 */
+		[key: string]: any;
+	}
+
 	interface PayTypeEntity {
 		/**
 		 * ID
@@ -1261,7 +1288,7 @@ declare namespace Eps {
 		 */
 		service?: string;
 		/**
-		 * ���币
+		 * 货币
 		 */
 		currency?: string;
 		/**
@@ -3153,6 +3180,10 @@ declare namespace Eps {
 		 * 交易订单回调通知
 		 */
 		notifyOrder(data?: any): Promise<any>;
+		/**
+		 * ACH订单回调通知
+		 */
+		notifyOrder(data?: any): Promise<any>;
 		/**
 		 * kyc basic 保存
 		 */
@@ -3266,6 +3297,7 @@ declare namespace Eps {
 			notifyOrder: string;
 			notifyOrder: string;
 			notifyOrder: string;
+			notifyOrder: string;
 			getCustomer: string;
 			toAdvanced: string;
 			countries: string;
@@ -3301,6 +3333,7 @@ declare namespace Eps {
 			notifyOrder: boolean;
 			notifyOrder: boolean;
 			notifyOrder: boolean;
+			notifyOrder: boolean;
 			getCustomer: boolean;
 			toAdvanced: boolean;
 			countries: boolean;
@@ -3426,6 +3459,63 @@ declare namespace Eps {
 		request: Service["request"];
 	}
 
+	interface DjOrderExtra {
+		/**
+		 * 删除
+		 */
+		delete(data?: any): Promise<any>;
+		/**
+		 * 修改
+		 */
+		update(data?: any): Promise<any>;
+		/**
+		 * 单个信息
+		 */
+		info(data?: any): Promise<OrderExtraEntity>;
+		/**
+		 * 分页查询
+		 */
+		page(data?: any): Promise<{
+			pagination: { size: number; page: number; total: number };
+			list: OrderExtraEntity[];
+			[key: string]: any;
+		}>;
+		/**
+		 * 列表查询
+		 */
+		list(data?: any): Promise<OrderExtraEntity[]>;
+		/**
+		 * 新增
+		 */
+		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 DjPayType {
 		/**
 		 * 删除
@@ -4169,6 +4259,7 @@ declare namespace Eps {
 			merchant: DjMerchant;
 			open: DjOpen;
 			order: DjOrder;
+			orderExtra: DjOrderExtra;
 			payType: DjPayType;
 			rate: DjRate;
 			refund: DjRefund;

src/modules/dj/views/mchChannel.vue

@@ -185,7 +185,7 @@ const Upsert = useUpsert({
 		);
 		if (data.code) {
 			const find: any = channels.value.find((item: any) => {
-				return item.payType === data.payType && item.code === data.code
+				return item.payType === data.payType && item.code === data.code && item.currency === data.currency;
 			})
 			data.code = find?.name
 		}
@@ -209,7 +209,7 @@ const Table = useTable({
 		{
 			prop: "channelName", label: "通道名", formatter: (row) => {
 				const find: any = channels.value.find((item: any) => {
-					return item.payType === row.payType && item.code === row.code;
+					return item.payType === row.payType && item.code === row.code && item.currency === row.currency;
 				})
 				return find?.name;
 			}

src/modules/dj/views/orderExtra.vue

@@ -0,0 +1,64 @@
+<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-orderExtra" setup>
+import { useCrud, useTable, useUpsert } from "@cool-vue/crud";
+import { useCool } from "/@/cool";
+
+const { service } = useCool();
+
+// cl-upsert
+const Upsert = useUpsert({
+	items: [
+		{ prop: "orderNo", label: "订单号", required: true, component: { name: "el-input" } },
+		{ prop: "info", label: "额外信息", component: { name: "el-input" } }
+	]
+});
+
+// cl-table
+const Table = useTable({
+	columns: [
+		{ type: "selection" },
+		{ prop: "orderNo", label: "订单号" },
+		{ prop: "info", label: "额外信息" },
+		{ type: "op", buttons: ["edit", "delete"] }
+	]
+});
+
+// cl-crud
+const Crud = useCrud(
+	{
+		service: service.dj.orderExtra
+	},
+	(app) => {
+		app.refresh();
+	}
+);
+</script>