1：优化商户管理页面BUG

2：优化应用关闭页面
3：完成支付订单CURD 以及单元测试
4：将 Element UI 从 2.15.0 升级至 2.15.6

yudao-admin-ui/src/utils/constants.js

@@ -91,6 +91,9 @@ export const SysUserSocialTypeEnum = {
   }
 }
 
+/**
+ * 支付渠道枚举
+ */
 export const PayChannelEnum = {
   WX_PUB: {
     "code": "wx_pub",
@@ -122,7 +125,65 @@ export const PayChannelEnum = {
   },
 }
 
+/**
+ * 支付类型枚举
+ */
 export const PayType = {
   WECHAT: "WECHAT",
   ALIPAY: "ALIPAY"
 }
+
+/**
+ * 支付订单状态枚举
+ */
+export const payOrderStatusEnum = {
+  WAITING: {
+    status: 0,
+    name: '未支付'
+  },
+  SUCCESS: {
+    status: 10,
+    name: '已支付'
+  },
+  CLOSED: {
+    status: 20,
+    name: '未支付'
+  }
+}
+
+/**
+ * 支付订单回调状态枚举
+ */
+export const payOrderNotifyStatusEnum = {
+  NO: {
+    status: 0,
+    name: '未通知'
+  },
+  SUCCESS: {
+    status: 10,
+    name: '通知成功'
+  },
+  FAILURE: {
+    status: 20,
+    name: '通知失败'
+  }
+}
+
+/**
+ * 支付订单退款状态枚举
+ */
+export const payOrderRefundStatusEnum = {
+  NO: {
+    status: 0,
+    name: '未退款'
+  },
+  SOME: {
+    status: 10,
+    name: '部分退款'
+  },
+  ALL: {
+    status: 20,
+    name: '全部退款'
+  }
+}
+

yudao-admin-ui/src/utils/dict.js

@@ -45,6 +45,14 @@ export const DICT_TYPE = {
   PAY_CHANNEL_ALIPAY_MODE:'pay_channel_alipay_mode',
   // 支付宝网关地址
   PAY_CHANNEL_ALIPAY_SERVER_TYPE:'pay_channel_alipay_server_type',
+  // 支付渠道编码类型
+  PAY_CHANNEL_CODE_TYPE: 'pay_channel_code_type',
+  // 商户支付订单回调状态
+  PAY_ORDER_NOTIFY_STATUS: 'pay_order_notify_status',
+  // 商户支付订单状态
+  PAY_ORDER_STATUS: 'pay_order_status',
+  // 商户支付订单退款状态
+  PAY_ORDER_REFUND_STATUS: 'pay_order_refund_status',
 }
 
 /**

yudao-admin-ui/src/utils/ruoyi.js

@@ -7,66 +7,68 @@ const baseURL = process.env.VUE_APP_BASE_API
 
 // 日期格式化
 export function parseTime(time, pattern) {
-	if (arguments.length === 0 || !time) {
-		return null
-	}
-	const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
-	let date
-	if (typeof time === 'object') {
-		date = time
-	} else {
-		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-			time = parseInt(time)
-		} else if (typeof time === 'string') {
-			time = time.replace(new RegExp(/-/gm), '/');
-		}
-		if ((typeof time === 'number') && (time.toString().length === 10)) {
-			time = time * 1000
-		}
-		date = new Date(time)
-	}
-	const formatObj = {
-		y: date.getFullYear(),
-		m: date.getMonth() + 1,
-		d: date.getDate(),
-		h: date.getHours(),
-		i: date.getMinutes(),
-		s: date.getSeconds(),
-		a: date.getDay()
-	}
-	const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-		let value = formatObj[key]
-		// Note: getDay() returns 0 on Sunday
-		if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
-		if (result.length > 0 && value < 10) {
-			value = '0' + value
-		}
-		return value || 0
-	})
-	return time_str
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
 }
 
 // 表单重置
 export function resetForm(refName) {
-	if (this.$refs[refName]) {
-		this.$refs[refName].resetFields();
-	}
+  if (this.$refs[refName]) {
+    this.$refs[refName].resetFields();
+  }
 }
 
 // 添加日期范围
 export function addDateRange(params, dateRange, propName) {
   const search = params;
   search.params = {};
-	if (null != dateRange && '' !== dateRange) {
-		if (typeof(propName) === "undefined") {
-			search["beginTime"] = dateRange[0];
-			search["endTime"] = dateRange[1];
-		} else {
-			search["begin" + propName] = dateRange[0];
-			search["end" + propName] = dateRange[1];
-		}
-	}
-	return search;
+  if (null != dateRange && '' !== dateRange) {
+    if (typeof (propName) === "undefined") {
+      search["beginTime"] = dateRange[0];
+      search["endTime"] = dateRange[1];
+    } else {
+      search["begin" + propName] = dateRange[0];
+      search["end" + propName] = dateRange[1];
+    }
+  }
+  return search;
 }
 
 /**
@@ -98,21 +100,21 @@ export function addBeginAndEndTime(params, dateRange, propName) {
   return params;
 }
 
-// 回显数据字典
+// 回显数据字典 原若依所保留，请使用 dict.js 中的新方法
 export function selectDictLabel(datas, value) {
-	var actions = [];
-	Object.keys(datas).some((key) => {
-		if (datas[key].dictValue == ('' + value)) {
-			actions.push(datas[key].dictLabel);
-			return true;
-		}
-	})
-	return actions.join('');
+  var actions = [];
+  Object.keys(datas).some((key) => {
+    if (datas[key].dictValue == ('' + value)) {
+      actions.push(datas[key].dictLabel);
+      return true;
+    }
+  })
+  return actions.join('');
 }
 
 // 通用下载方法
 export function download(fileName) {
-	window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
+  window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
 }
 
 // 下载 Excel 方法
@@ -147,7 +149,7 @@ function download0(data, fileName, mineType) {
   window.URL = window.URL || window.webkitURL;
   let href = URL.createObjectURL(blob);
   let downA = document.createElement("a");
-  downA.href =  href;
+  downA.href = href;
   downA.download = fileName;
   downA.click();
   // 销毁超连接
@@ -156,24 +158,24 @@ function download0(data, fileName, mineType) {
 
 // 字符串格式化(%s )
 export function sprintf(str) {
-	var args = arguments, flag = true, i = 1;
-	str = str.replace(/%s/g, function () {
-		var arg = args[i++];
-		if (typeof arg === 'undefined') {
-			flag = false;
-			return '';
-		}
-		return arg;
-	});
-	return flag ? str : '';
+  var args = arguments, flag = true, i = 1;
+  str = str.replace(/%s/g, function () {
+    var arg = args[i++];
+    if (typeof arg === 'undefined') {
+      flag = false;
+      return '';
+    }
+    return arg;
+  });
+  return flag ? str : '';
 }
 
 // 转换字符串，undefined,null等转化为""
 export function praseStrEmpty(str) {
-	if (!str || str == "undefined" || str == "null") {
-		return "";
-	}
-	return str;
+  if (!str || str == "undefined" || str == "null") {
+    return "";
+  }
+  return str;
 }
 
 /**
@@ -185,21 +187,42 @@ export function praseStrEmpty(str) {
  * @param {*} rootId 根Id 默认 0
  */
 export function handleTree(data, id, parentId, children, rootId) {
-	id = id || 'id'
-	parentId = parentId || 'parentId'
-	children = children || 'children'
-	rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
-	//对源数据深度克隆
-	const cloneData = JSON.parse(JSON.stringify(data))
-	//循环所有项
-	const treeData = cloneData.filter(father => {
-		let branchArr = cloneData.filter(child => {
-			//返回每一项的子级数组
-			return father[id] === child[parentId]
-		});
-		branchArr.length > 0 ? father.children = branchArr : '';
-		//返回第一层
-		return father[parentId] === rootId;
-	});
-	return treeData !== '' ? treeData : data;
+  id = id || 'id'
+  parentId = parentId || 'parentId'
+  children = children || 'children'
+  rootId = rootId || Math.min.apply(Math, data.map(item => {
+    return item[parentId]
+  })) || 0
+  //对源数据深度克隆
+  const cloneData = JSON.parse(JSON.stringify(data))
+  //循环所有项
+  const treeData = cloneData.filter(father => {
+    let branchArr = cloneData.filter(child => {
+      //返回每一项的子级数组
+      return father[id] === child[parentId]
+    });
+    branchArr.length > 0 ? father.children = branchArr : '';
+    //返回第一层
+    return father[parentId] === rootId;
+  });
+  return treeData !== '' ? treeData : data;
+}
+
+/**
+ * 获取当前时间
+ * @param timeStr 时分秒 字符串 格式为 xx:xx:xx
+ */
+export function getNowDateTime(timeStr) {
+  let now = new Date();
+  let year = now.getFullYear(); //得到年份
+  let month = (now.getMonth() + 1).toString().padStart(2, "0"); //得到月份
+  let day = now.getDate().toString().padStart(2, "0"); //得到日期
+
+  if (timeStr != null) {
+    return `${year}-${month}-${day} ${timeStr}`;
+  }
+  let hours = now.getHours().toString().padStart(2, "0") // 得到小时;
+  let minutes = now.getMinutes().toString().padStart(2, "0") // 得到分钟;
+  let seconds = now.getSeconds().toString().padStart(2, "0") // 得到秒;
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }