From 40e866aaddf076223385b321853ecfb52cb8f97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E7=A8=8B?= Date: Fri, 25 Mar 2022 18:12:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=85=8D=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E5=95=86=E5=93=81=E9=80=81=E6=A8=A1=E6=9D=BF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/src/main/java/cn/lili/common/enums/ResultCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 7b61c34ff..021c2b367 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -77,7 +77,7 @@ public enum ResultCode { MUST_HAVE_GOODS_SKU(11012, "规格必须要有一个！"), GOODS_PARAMS_ERROR(11013, "商品参数错误，刷新后重试"), PHYSICAL_GOODS_NEED_TEMP(11014, "实物商品需选择配送模板"), - VIRTUAL_GOODS_NOT_NEED_TEMP(11015, "实物商品需选择配送模板"), + VIRTUAL_GOODS_NOT_NEED_TEMP(11015, "虚拟商品无需选择配送模板"), GOODS_NOT_EXIST_STORE(11017, "当前用户无权操作此商品"), GOODS_TYPE_ERROR(11016, "需选择商品类型"), From de5e97ac3aa13df6e0bf26a11b44c5f5660fb0a0 Mon Sep 17 00:00:00 2001 From: *** <*****@***.***> Date: Sun, 27 Mar 2022 07:41:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96cn.lili.common.utils.Comm?= =?UTF-8?q?onUtil.getRandomNum=E6=96=B9=E6=B3=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/common/utils/CommonUtil.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/utils/CommonUtil.java b/framework/src/main/java/cn/lili/common/utils/CommonUtil.java index 65c82bc88..61e7ebe98 100644 --- a/framework/src/main/java/cn/lili/common/utils/CommonUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/CommonUtil.java @@ -1,7 +1,7 @@ package cn.lili.common.utils; -import java.util.Random; import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; /** * 通用工具 @@ -9,6 +9,8 @@ import java.util.UUID; */ public class CommonUtil { + public static final String BASE_NUMBER = "0123456789"; + /** * 以UUID重命名 * @param fileName 文件名称 @@ -24,12 +26,12 @@ public class CommonUtil { * 随机6位数生成 */ public static String getRandomNum() { - - Random random = new Random(); - int num = random.nextInt(999999); - //不足六位前面补0 - String str = String.format("%06d", num); - return str; + StringBuilder sb = new StringBuilder(6); + for (int i = 0; i < 6; i++) { + int num = ThreadLocalRandom.current().nextInt(BASE_NUMBER.length()); + sb.append(BASE_NUMBER.charAt(num)); + } + return sb.toString(); } } From bd9f7b8b9f3ebab9ca8b4b2a924f5a07414d7889 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 30 Mar 2022 11:54:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/order/serviceimpl/StoreFlowServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java index 6df5053fe..3fdf030ce 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java @@ -83,6 +83,8 @@ public class StoreFlowServiceImpl extends ServiceImpl