From cfb194a845787e6e2aab94f909eec676b0153ad9 Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 18 Mar 2025 19:27:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D`NumberChineseFormatter.forma?= =?UTF-8?q?t`=E4=B8=AD=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=9C=A80=E6=97=B6=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=88issue#3888@Github=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- .../cn/hutool/core/convert/NumberChineseFormatter.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c52991822..a74e33d8d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ # 🚀Changelog ------------------------------------------------------------------------------------------------------------- -# 5.8.37(2025-03-11) +# 5.8.37(2025-03-18) ### 🐣新特性 * 【json 】 ObjectMapper删除重复trim（pr#3859@Github） @@ -19,6 +19,7 @@ * 【cache 】 修复`ReentrantCache#getOrRemoveExpired`方法丢失onRemove触发问题（pr#1315@Gitee） * 【json 】 修复`JsonUtil.toBean`泛型数组类型丢失问题（pr#3876@Github） * 【http 】 修复`HttpUtil.normalizeParams`规则问题（issue#IBQIYQ@Gitee） +* 【http 】 修复`NumberChineseFormatter.format`中自定义单位在0时错误问题（issue#3888@Github） ------------------------------------------------------------------------------------------------------------- # 5.8.36(2025-02-18) diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java b/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java index 14a5acd01..dd85a8eae 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java @@ -91,8 +91,12 @@ public class NumberChineseFormatter { * @since 5.7.23 */ public static String format(double amount, boolean isUseTraditional, boolean isMoneyMode, String negativeName, String unitName) { + if(StrUtil.isNullOrUndefined(unitName)){ + unitName = "元"; + } + if (0 == amount) { - return isMoneyMode ? "零元整" : "零"; + return isMoneyMode ? "零" + unitName + "整" : "零"; } Assert.checkBetween(amount, -99_9999_9999_9999.99, 99_9999_9999_9999.99, "Number support only: (-99999999999999.99 ~ 99999999999999.99)！"); @@ -116,7 +120,7 @@ public class NumberChineseFormatter { // 金额模式下，无需“零元” chineseStr.append(longToChinese(yuan, isUseTraditional)); if (isMoneyMode) { - chineseStr.append(StrUtil.isNullOrUndefined(unitName) ? "元" : unitName); + chineseStr.append(unitName); } }