From 4e01b27642aa6195e4c8a5f49a64e76dd7dea06d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 07 Apr 2023 15:46:20 +0800
Subject: [PATCH] Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng

---
 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