lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复Convert.digitToChinese(0)输出金额无元整问题

Browse Source
This commit is contained in:
Looly 2024-07-31 00:15:37 +08:00
parent 8ae3a87174
commit 4bb0a445c4
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,7 +2,7 @@
# 🚀Changelog # 🚀Changelog
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.8.30(2024-07-30) # 5.8.30(2024-07-31)
### 🐣新特性 ### 🐣新特性
* 【core 】 Converter转换规则变更，空对象、空值转为Bean时，创建默认对象，而非null（issue#3649@Github） * 【core 】 Converter转换规则变更，空对象、空值转为Bean时，创建默认对象，而非null（issue#3649@Github）
@ -22,6 +22,7 @@
* 【core 】 修复FileUtil.file末尾换行符导致路径判断错误的问题（issue#IAB65V@Gitee） * 【core 】 修复FileUtil.file末尾换行符导致路径判断错误的问题（issue#IAB65V@Gitee）
* 【core 】 修复FileTypeUtil.getType空指针问题（issue#IAD5JM@Gitee） * 【core 】 修复FileTypeUtil.getType空指针问题（issue#IAD5JM@Gitee）
* 【core 】 修复IdcardUtil.isValidHKCard校验问题（issue#IAFOLI@Gitee） * 【core 】 修复IdcardUtil.isValidHKCard校验问题（issue#IAFOLI@Gitee）
* 【core 】 修复Convert.digitToChinese(0)输出金额无`元整问题`（issue#3662@Github）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.8.29(2024-07-03) # 5.8.29(2024-07-03)

2
hutool-core/src/main/java/cn/hutool/core/convert/Convert.java
View File

@ -1030,7 +1030,7 @@ public class Convert {
*/ */
public static String digitToChinese(Number n) { public static String digitToChinese(Number n) {
if (null == n) { if (null == n) {
return "零"; n = 0;
} }
return NumberChineseFormatter.format(n.doubleValue(), true, true); return NumberChineseFormatter.format(n.doubleValue(), true, true);
} }

2
hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java
View File

@ -92,7 +92,7 @@ public class NumberChineseFormatter {
*/ */
public static String format(double amount, boolean isUseTraditional, boolean isMoneyMode, String negativeName, String unitName) { public static String format(double amount, boolean isUseTraditional, boolean isMoneyMode, String negativeName, String unitName) {
if (0 == amount) { if (0 == amount) {
return "零"; return isMoneyMode ? "零元整" : "零";
} }
Assert.checkBetween(amount, -99_9999_9999_9999.99, 99_9999_9999_9999.99, Assert.checkBetween(amount, -99_9999_9999_9999.99, 99_9999_9999_9999.99,
"Number support only: (-99999999999999.99 ~ 99999999999999.99)！"); "Number support only: (-99999999999999.99 ~ 99999999999999.99)！");

8
hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
View File

@ -435,4 +435,12 @@ public class ConvertTest {
Assert.assertEquals(12, s); Assert.assertEquals(12, s);
} }
@Test
public void issue3662Test() {
String s = Convert.digitToChinese(0);
Assert.assertEquals("零元整", s);
s = Convert.digitToChinese(null);
Assert.assertEquals("零元整", s);
}
} }