From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-common/src/main/java/org/sxkj/common/utils/OrderNumUtils.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/drone-common/src/main/java/org/sxkj/common/utils/OrderNumUtils.java b/drone-common/src/main/java/org/sxkj/common/utils/OrderNumUtils.java
index 6c4c488..81ab5be 100644
--- a/drone-common/src/main/java/org/sxkj/common/utils/OrderNumUtils.java
+++ b/drone-common/src/main/java/org/sxkj/common/utils/OrderNumUtils.java
@@ -51,7 +51,7 @@
 	}
 
 	/**
-	 * 订单号生成
+	 * 订单号生成 带时分秒
 	 *
 	 * @param prefKey 缓存前缀key
 	 * @return 订单号生成
@@ -64,4 +64,18 @@
 		return currentTime + lastNum;
 	}
 
+	/**
+	 * 订单号生成 带时间
+	 *
+	 * @param prefKey 缓存前缀key
+	 * @return 订单号生成
+	 */
+	public static String initOrderNum2(String prefKey) {
+		Integer num = getRedisNumValue(prefKey);
+		String lastNum = formatDayOrderNumLast(3, num + 1);
+		Date date = new Date();
+		String currentTime = DateUtil.format(date, CommonConstant.yyyyMMdd);
+		return currentTime + lastNum;
+	}
+
 }

--
Gitblit v1.9.3