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

Merge pull request from zflovecoding/v5-dev

Browse Source 
[bug修复] 修复金额转换为英文时缺少 trillion 单位
This commit is contained in:
Golden Looly 2024-01-02 13:33:19 +08:00 committed by GitHub
commit 14da4e7151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
hutool-core/src
main/java/cn/hutool/core/convert
NumberWordFormatter.java
test/java/cn/hutool/core/convert
NumberWordFormatTest.java

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

@ -19,7 +19,7 @@ public class NumberWordFormatter {
"FIFTEEN", "SIXTEEN", "SEVENTEEN", "EIGHTEEN", "NINETEEN"};
private static final String[] NUMBER_TEN = new String[]{"TEN", "TWENTY", "THIRTY", "FORTY", "FIFTY", "SIXTY",
"SEVENTY", "EIGHTY", "NINETY"};
private static final String[] NUMBER_MORE = new String[]{"", "THOUSAND", "MILLION", "BILLION"};
private static final String[] NUMBER_MORE = new String[]{"", "THOUSAND", "MILLION", "BILLION", "TRILLION"};
private static final String[] NUMBER_SUFFIX = new String[]{"k", "w", "", "m", "", "", "b", "", "", "t", "", "", "p", "", "", "e"};

3
hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java
View File

@ -12,6 +12,9 @@ public class NumberWordFormatTest {
String format2 = NumberWordFormatter.format("2100.00");
Assert.assertEquals("TWO THOUSAND ONE HUNDRED AND CENTS ONLY", format2);
String format3 = NumberWordFormatter.format("1234567890123.12");
Assert.assertEquals("ONE TRILLION TWO HUNDRED AND THIRTY FOUR BILLION FIVE HUNDRED AND SIXTY SEVEN MILLION EIGHT HUNDRED AND NINETY THOUSAND ONE HUNDRED AND TWENTY THREE AND CENTS TWELVE ONLY", format3);
}
@Test