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

fix bug

Browse Source
This commit is contained in:
Looly 2021-07-26 18:43:46 +08:00
parent 49e63dd424
commit 56d4a849f4
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -23,6 +23,7 @@
* 【core 】 修复FileTypeUtil判断wps修改过的xlsx误判为jar的问题（pr#380@Gitee）
* 【core 】 修复Sftp.isDir异常bug（pr#378@Gitee）
* 【core 】 修复BeanUtil.copyProperties集合元素复制成功，读取失败的问题（issue#I41WKP@Gitee）
* 【core 】 修复NumberChineseFormatter.chineseToNumber十位数错误（issue#1726@Gitee）
-------------------------------------------------------------------------------------------------------------

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

@ -249,7 +249,14 @@ public class NumberChineseFormatter {
section = 0;
} else {
// 非节单位，和单位前的单数字组合为值
section += (number * unit.value);
int unitNumber = number;
if(0 == number && 0 == i){
// issue#1726，对于单位开头的数组，默认赋予1
// 十二 -> 一十二
// 百二 -> 一百二
unitNumber = 1;
}
section += (unitNumber * unit.value);
}
number = 0;
}

10
hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java
View File

@ -116,6 +116,16 @@ public class NumberChineseFormatterTest {
Assert.assertEquals(22010, NumberChineseFormatter.chineseToNumber("两万二零一十"));
}
@Test
public void chineseToNumberTest3(){
// issue#1726，对于单位开头的数组，默认赋予1
// 十二 -> 一十二
// 百二 -> 一百二
Assert.assertEquals(12, NumberChineseFormatter.chineseToNumber("十二"));
Assert.assertEquals(120, NumberChineseFormatter.chineseToNumber("百二"));
Assert.assertEquals(1300, NumberChineseFormatter.chineseToNumber("千三"));
}
@Test(expected = IllegalArgumentException.class)
public void badNumberTest(){
// 连续数字检查