lazhaoqian 3 лет назад
Родитель
Сommit
a76f28a66f

+ 6 - 6
blade-common/src/main/java/org/springblade/common/utils/NumToWords.java

@@ -16,7 +16,7 @@ public class NumToWords {
 
 	public static String parse(String x) {
 		if(Double.parseDouble(x) <= 0){
-			return "Zero Cents only";
+			return "ZERO CENTS ONLY";
 		}
 		int z = x.indexOf("."); // 取小数点位置
 		String lstr = "", rstr = "";
@@ -56,10 +56,10 @@ public class NumToWords {
 			if(transTwo == null || "".equals(transTwo)){
 				xs = "";
 			}else{
-				xs = "and " + transTwo + " Cents "; // 小数部分存在时转换小数
+				xs = "AND " + transTwo + " CENTS "; // 小数部分存在时转换小数
 			}
 		}
-		return lm.trim() + " " + xs + "only";
+		return lm.trim() + " " + xs + "ONLY";
 	}
 
 	private static String parseFirst(String s) {
@@ -98,7 +98,7 @@ public class NumToWords {
 	}
 
 	private static String parseMore(String s) {
-		String[] a = new String[] { "", "Thousand", "Million", "Billion" };
+		String[] a = new String[] { "", "THOUSAND", "MILLION", "BILLION" };
 		return a[Integer.parseInt(s)];
 	}
 
@@ -109,9 +109,9 @@ public class NumToWords {
 		if (s.startsWith("0")) // 是否小於100
 			value = transTwo(s.substring(1));
 		else if (s.substring(1).equals("00")) // 是否被100整除
-			value = parseFirst(s.substring(0, 1)) + " Hundred";
+			value = parseFirst(s.substring(0, 1)) + " HUNDRED";
 		else
-			value = parseFirst(s.substring(0, 1)) + " Hundred and " + transTwo(s.substring(1));
+			value = parseFirst(s.substring(0, 1)) + " HUNDRED AND " + transTwo(s.substring(1));
 		return value;
 	}