From b29812c8f988cadd9e2fc65fdf4001610fb09ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 9 Jul 2019 18:13:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/util/OrderNoMakeUtil.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java index 7085fd0..7aa754f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java @@ -5,9 +5,12 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import com.alibaba.fastjson.JSON; import org.apache.commons.lang3.StringUtils; import java.text.MessageFormat; import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Locale; /** * @Description : 单号生成工具类 @@ -30,15 +33,17 @@ public class OrderNoMakeUtil { .build(); } + String[] dateTime = new SimpleDateFormat("yyyy-yy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()).split("-"); StringBuilder orderNo = new StringBuilder(orderNoRule.getOrderNoRule()); - String[] dateTime = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()).split("-"); + // 单号表达式 - replace(orderNo, PlatformConstWords.YEAR, dateTime[0]); - replace(orderNo, PlatformConstWords.MONTH, dateTime[1]); - replace(orderNo, PlatformConstWords.DAY, dateTime[2]); - replace(orderNo, PlatformConstWords.HOUR, dateTime[3]); - replace(orderNo, PlatformConstWords.MINUTE, dateTime[4]); - replace(orderNo, PlatformConstWords.SECOND, dateTime[5]); + replace(orderNo, PlatformConstWords.YEAR_FULL, dateTime[0]); + replace(orderNo, PlatformConstWords.YEAR, dateTime[1]); + replace(orderNo, PlatformConstWords.MONTH, dateTime[2]); + replace(orderNo, PlatformConstWords.DAY, dateTime[3]); + replace(orderNo, PlatformConstWords.HOUR, dateTime[4]); + replace(orderNo, PlatformConstWords.MINUTE, dateTime[5]); + replace(orderNo, PlatformConstWords.SECOND, dateTime[6]); // 流水号长度补全表达式 String serialNoFormatStr = MessageFormat.format(PlatformConstWords.SERIAL_NO_FORMAT, orderNoRule.getSerialNoLength()); @@ -69,12 +74,11 @@ public class OrderNoMakeUtil { * @param param * @return */ - private static StringBuilder replace(StringBuilder no, String constant, String param) { + private static StringBuilder replace(StringBuilder no, String constant, Object param) { int day = no.indexOf(constant); if (day != -1) { - no.replace(day, day + constant.length(), param); + no.replace(day, day + constant.length(), param.toString()); } return no; } - }