From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/common/utils/MallUtils.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/utils/MallUtils.java b/src/main/java/cc/mrbird/febs/common/utils/MallUtils.java
index fb61d3f..2f28b00 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/MallUtils.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/MallUtils.java
@@ -1,5 +1,7 @@
package cc.mrbird.febs.common.utils;
+import cn.hutool.core.util.StrUtil;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
@@ -22,9 +24,16 @@
return sb.toString();
}
- public static String getOrderNum() {
+ public static String getOrderNum(String prefix) {
SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
String dd=df.format(new Date());
+ if (StrUtil.isNotBlank(prefix)) {
+ return prefix+dd+getRandomNum(5);
+ }
return dd+getRandomNum(5);
}
+
+ public static String getOrderNum() {
+ return getOrderNum(null);
+ }
}
--
Gitblit v1.9.1