订单增加取消状态

订单增加取消状态

build/cool/temp/eps.d.ts

@@ -456,7 +456,7 @@ declare namespace Eps {
 		 */
 		notifyUrl?: string;
 		/**
-		 * 订单状态 0-待支付 1 已支付 2 支付失败 3 退款成功
+		 * 订单状态 0-待支付 1 已支付 2 支付失败 3 订单取消
 		 */
 		status?: boolean;
 		/**
@@ -927,7 +927,7 @@ declare namespace Eps {
 		 */
 		notifyUrl?: string;
 		/**
-		 * 订单状态 0-待支付 1 已支付 2 支付失败 3 退款成功
+		 * 订单状态 0-待支付 1 已支付 2 支付失败 3 订单取消
 		 */
 		status?: boolean;
 		/**
@@ -3129,6 +3129,14 @@ declare namespace Eps {
 	}
 
 	interface DjOpen {
+		/**
+		 * 巴西交易订单回调通知
+		 */
+		notifyWithdraw(data?: any): Promise<any>;
+		/**
+		 * 巴西交易订单回调通知
+		 */
+		notifyWithdraw(data?: any): Promise<any>;
 		/**
 		 * 巴西交易订单回调通知
 		 */
@@ -3249,6 +3257,8 @@ declare namespace Eps {
 		 * 权限标识
 		 */
 		permission: {
+			notifyWithdraw: string;
+			notifyWithdraw: string;
 			notifyOrder: string;
 			notifyOrder: string;
 			notifyOrder: string;
@@ -3282,6 +3292,8 @@ declare namespace Eps {
 		 * 权限状态
 		 */
 		_permission: {
+			notifyWithdraw: boolean;
+			notifyWithdraw: boolean;
 			notifyOrder: boolean;
 			notifyOrder: boolean;
 			notifyOrder: boolean;

src/modules/dj/views/agentOrder.vue

@@ -100,7 +100,11 @@ const items = ref<ClForm.Item[]>([
 				{
 					label: "下单失败",
 					value: 2
-				}
+				},
+				{
+					label: "订单取消",
+					value: 3
+				},
 			]
 		}
 	},
@@ -184,7 +188,8 @@ const Table = useTable({
 			dict: [
 				{ label: "待支付", value: 0, color: "#909399" },
 				{ label: "支付成功", value: 1, color: "#67C23A" },
-				{ label: "下单失败", value: 2, color: "#F56C6C" }
+				{ label: "下单失败", value: 2, color: "#F56C6C" },
+				{ label: "订单取消", value: 3, color: "#F56C6C" }
 			],
 		},
 		{ prop: "payType", label: "支付方式", showOverflowTooltip: true },

src/modules/dj/views/order.vue

@@ -215,7 +215,11 @@ const items = ref<ClForm.Item[]>([
 				{
 					label: "下单失败",
 					value: 2
-				}
+				},
+				{
+					label: "订单取消",
+					value: 3
+				},
 			]
 		}
 	},
@@ -333,7 +337,11 @@ const Upsert = useUpsert({
 					{
 						label: "下单失败",
 						value: 2
-					}
+					},
+					{
+						label: "订单取消",
+						value: 3
+					},
 				]
 			},
 			required: true
@@ -406,7 +414,8 @@ const Table = useTable({
 			dict: [
 				{ label: "待支付", value: 0, color: "#909399" },
 				{ label: "支付成功", value: 1, color: "#67C23A" },
-				{ label: "下单失败", value: 2, color: "#F56C6C" }
+				{ label: "下单失败", value: 2, color: "#F56C6C" },
+				{ label: "订单取消", value: 3, color: "#F56C6C" }
 			], width: 90
 		},
 		{
@@ -438,7 +447,7 @@ const Table = useTable({
 						}
 					});
 				}
-				if (+scope.row.status === 1) {
+				if (+scope.row.status === 1 || +scope.row.status === 3) {
 					// if (checkPerm(service.dj.order.permission.toRefund)) {
 					// 	btns.push({
 					// 		label: "退款",