1

build/cool/temp/eps.d.ts

@@ -390,45 +390,6 @@ declare namespace Eps {
 		[key: string]: any;
 	}
 
-	interface BankEntity {
-		/**
-		 * ID
-		 */
-		id?: number;
-		/**
-		 * 账户
-		 */
-		accountNo?: string;
-		/**
-		 * 银行编码
-		 */
-		bankCode?: string;
-		/**
-		 * 银行名称
-		 */
-		bankName?: string;
-		/**
-		 * 账户名
-		 */
-		accountName?: string;
-		/**
-		 * 备注
-		 */
-		remark?: string;
-		/**
-		 * 创建时间
-		 */
-		createTime?: Date;
-		/**
-		 * 更新时间
-		 */
-		updateTime?: Date;
-		/**
-		 * 任意键值
-		 */
-		[key: string]: any;
-	}
-
 	interface BillEntity {
 		/**
 		 * ID
@@ -2008,63 +1969,6 @@ declare namespace Eps {
 		request: Service["request"];
 	}
 
-	interface DjBank {
-		/**
-		 * 删除
-		 */
-		delete(data?: any): Promise<any>;
-		/**
-		 * 修改
-		 */
-		update(data?: any): Promise<any>;
-		/**
-		 * 列表查询
-		 */
-		list(data?: any): Promise<BankEntity[]>;
-		/**
-		 * 单个信息
-		 */
-		info(data?: any): Promise<BankEntity>;
-		/**
-		 * 分页查询
-		 */
-		page(data?: any): Promise<{
-			pagination: { size: number; page: number; total: number };
-			list: BankEntity[];
-			[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 DjBill {
 		/**
 		 * 单个信息
@@ -2433,7 +2337,11 @@ declare namespace Eps {
 
 	interface DjOpen {
 		/**
-		 * 交易订单回调通知
+		 * 巴西交易订单回调通知
+		 */
+		notifyOrder(data?: any): Promise<any>;
+		/**
+		 * 印度交易订单回调通知
 		 */
 		notifyOrder(data?: any): Promise<any>;
 		/**
@@ -2508,6 +2416,7 @@ declare namespace Eps {
 		 * 权限标识
 		 */
 		permission: {
+			notifyOrder: string;
 			notifyOrder: string;
 			notifyOrder: string;
 			countries: string;
@@ -2530,6 +2439,7 @@ declare namespace Eps {
 		 * 权限状态
 		 */
 		_permission: {
+			notifyOrder: boolean;
 			notifyOrder: boolean;
 			notifyOrder: boolean;
 			countries: boolean;
@@ -3045,7 +2955,6 @@ declare namespace Eps {
 		dict: { info: DictInfo; type: DictType };
 		dj: {
 			balance: DjBalance;
-			bank: DjBank;
 			bill: DjBill;
 			channel: DjChannel;
 			comm: DjComm;

src/modules/dj/views/bank.vue

@@ -1,122 +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-bank" setup>
-import { useCrud, useTable, useUpsert } from "@cool-vue/crud";
-import { useCool } from "/@/cool";
-
-const { service } = useCool();
-
-const banks = [
-	{ label: "工商银行", value: "01010000" },
-	{ label: "农业银行", value: "01010001" },
-	{ label: "中国银行", value: "01010002" },
-	{ label: "建设银行", value: "01010003" },
-	{ label: "交通银行", value: "01010004" },
-	{ label: "平安银行", value: "01010005" },
-	{ label: "中信银行", value: "01010006" },
-	{ label: "光大银行", value: "01010007" },
-	{ label: "华夏银行", value: "01010008" },
-	{ label: "民生银行", value: "01010009" },
-	{ label: "广发银行", value: "01010010" },
-	{ label: "招商银行", value: "01010011" },
-	{ label: "兴业银行", value: "01010012" },
-	{ label: "浦发银行", value: "01010013" },
-	{ label: "北京银行", value: "01010014" },
-	{ label: "天津银行", value: "01010015" },
-	{ label: "上海银行", value: "01010016" },
-	{ label: "江苏银行", value: "01010017" },
-	{ label: "重庆银行", value: "01010018" },
-	{ label: "大连银行", value: "01010019" },
-	{ label: "哈尔滨银行", value: "01010020" },
-	{ label: "南京银行", value: "01010021" },
-	{ label: "杭州银行", value: "01010022" },
-	{ label: "宁波银行", value: "01010023" },
-	{ label: "温州银行", value: "01010024" },
-	{ label: "恒丰银行", value: "01010025" },
-	{ label: "浙商银行", value: "01010026" }
-];
-
-// cl-upsert
-const Upsert = useUpsert({
-	items: [
-		{ prop: "accountNo", label: "账户", required: true, component: { name: "el-input" } },
-		{
-			prop: "bankCode",
-			label: "银行",
-			component: {
-				name: "el-select",
-				options: banks
-			},
-			required: true
-		},
-		// { prop: "bankName", label: "银行名称", required: true, component: { name: "el-input" } },
-		{ prop: "accountName", label: "账户名", required: true, component: { name: "el-input" } },
-		{
-			prop: "remark",
-			label: "备注",
-			component: { name: "el-input", props: { type: "textarea", rows: 4 } }
-		}
-	],
-	onSubmit(data, { next }) {
-		data.bankName = banks.find((item) => item.value === data.bankCode)?.label;
-		next(data);
-	}
-});
-
-// cl-table
-const Table = useTable({
-	autoHeight: false,
-	columns: [
-		{ type: "selection" },
-		{ prop: "accountNo", label: "账户" },
-		{
-			prop: "bankCode",
-			label: "银行编码"
-		},
-		{ prop: "bankName", label: "银行名称" },
-		{ prop: "accountName", label: "账户名" },
-		{ 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.bank
-	},
-	(app) => {
-		app.refresh();
-	}
-);
-</script>

src/modules/dj/views/merchant.vue

@@ -16,14 +16,10 @@
 			<!-- 数据表格 -->
 			<cl-table ref="Table">
 				<template #slot-info="{ scope }">
-					<el-button text bg type="success" @click="openInfo(scope.row)"
-						>商户信息</el-button
-					>
+					<el-button text bg type="success" @click="openInfo(scope.row)">商户信息</el-button>
 				</template>
 				<template #slot-balance="{ scope }">
-					<el-button text bg type="warning" @click="toBalance(scope.row)"
-						>余额变动</el-button
-					>
+					<el-button text bg type="warning" @click="toBalance(scope.row)">余额变动</el-button>
 				</template>
 			</cl-table>
 		</cl-row>
@@ -169,13 +165,13 @@ function openInfo(row: any) {
   商户号:  ${row.mchId}
   商户密码：
   商户密钥: ${row.key}
-  商户后台: http://205.234.252.199
+  商户后台: http://157.175.73.225
 
-  开发文档地址：https://205.234.252.199:32501/down/cZcmKxWoQn8r.docx
-
-  支付网关：http://205.234.252.199/api/admin/pay/open/order
-  查询网关: http://205.234.252.199/api/admin/pay/open/query
-  回调IP: 205.234.252.199
+  开发文档地址：https://doc.apipost.net/docs/detail/33d38ea154ee000?target_id=3d3371cff09002
+  
+  支付网关：http://157.175.73.225/api/admin/dj/open/order
+  查询网关: http://157.175.73.225/api/admin/dj/open/query
+  回调IP: 157.175.73.225
   `;
 }
 

src/modules/dj/views/order.vue

@@ -18,6 +18,21 @@
 		<cl-row>
 			<!-- 数据表格 -->
 			<cl-table ref="Table" :contextMenu="[]">
+				<template #column-orderNo="{ scope }">
+					<el-tooltip class="box-item" effect="dark" :content="scope.row.orderNo" placement="top">
+						<div class="tooltip">{{ scope.row.orderNo }}</div>
+					</el-tooltip>
+				</template>
+				<template #column-traceNo="{ scope }">
+					<el-tooltip class="box-item" effect="dark" :content="scope.row.traceNo" placement="top">
+						<div class="tooltip">{{ scope.row.traceNo }}</div>
+					</el-tooltip>
+				</template>
+				<template #column-outOrderNo="{ scope }">
+					<el-tooltip class="box-item" effect="dark" :content="scope.row.outOrderNo" placement="top">
+						<div class="tooltip">{{ scope.row.outOrderNo }}</div>
+					</el-tooltip>
+				</template>
 				<template #column-detail="{ scope }">
 					<div style="padding: 10px;">
 						<el-descriptions border :column="4" class="desc">
@@ -282,16 +297,15 @@ const Table = useTable({
 			label: "金额",
 			width: 90,
 			formatter(row) {
-				return (+row.amount).toFixed(2);
+				return (+row.amount).toFixed(2) + ' ' + row.currency;
 			}
 		},
-		{ prop: "currency", label: "货币单位" },
 		{
 			prop: "charge",
 			label: "手续费",
 			width: 90,
 			formatter(row) {
-				return +row.charge;
+				return (+row.amount).toFixed(2) + ' ' + row.currency;
 			}
 		},
 		{ prop: "createTime", label: "创建时间" },
@@ -317,7 +331,7 @@ const Table = useTable({
 		// { prop: "remark", label: "备注", showOverflowTooltip: true },
 		{
 			type: "op",
-			width: 220,
+			width: 204,
 			buttons({ scope }) {
 				const btns = [];
 				if (checkPerm(service.dj.order.permission.update)) {
@@ -415,4 +429,11 @@ const Crud = useCrud(
 .desc .el-descriptions__label {
 	min-width: 115px;
 }
+
+.tooltip {
+	max-width: 100px !important;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 </style>

src/modules/dj/views/test.vue

@@ -87,7 +87,7 @@ const key = ref("7bde11c1e5be0fca046f099c4264076e");
 const defaultForm = {
   mchId: "test",
   outOrderNo: "",
-  notifyUrl: "http://205.234.252.199/api/admin/dj/open/notifyTest",
+  notifyUrl: "http://157.175.73.225/api/admin/dj/open/notifyTest",
   returnUrl: "https://www.baidu.com",
   amount: 100,
   payType: "SunCard",