From bbd53c4c2e68d3f80b77e4624a8714969e4ea44e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Nov 2020 15:01:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=E6=9C=AA=E5=9B=BA=E5=AE=9A=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E7=94=9F=E6=88=90=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 b865b6b..8734d8f 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 @@ -50,11 +50,19 @@ public class OrderNoMakeUtil { if (orderNoRule.getSerialNo() > 0 && orderNo.indexOf(PlatformConstWords.SERIAL_NO) != -1) { String newNo = orderNo.substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO)); String oldNo = orderNoRule.getOrderNo().substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO)); + + long serialNo = orderNoRule.getSerialNo() + orderNoRule.getSerialNoIncrement(); + // 前缀（日期）不同后是否重置流水号 if(!newNo.equals(oldNo) && orderNoRule.getIsCycle() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed()); } else { - orderNoRule.setSerialNo(orderNoRule.getSerialNo() + orderNoRule.getSerialNoIncrement()); + orderNoRule.setSerialNo(serialNo); + } + + if (CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(orderNoRule.getIsFixedLength()) + && String.valueOf(serialNo).length() > orderNoRule.getSerialNoLength()) { + orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed()); } } else { orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed() * orderNoRule.getSerialNoIncrement());