diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java index 21b5310..78d4a0f 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java @@ -835,8 +835,8 @@ public class Convert { * * @return 半角字符串 */ - public static String toDBC (String input) { - return toDBC(input, null); + public static String toDbc(String input) { + return toDbc(input, null); } /** @@ -847,7 +847,7 @@ public class Convert { * * @return 替换后的字符 */ - public static String toDBC (String text, Set notConvertSet) { + public static String toDbc(String text, Set notConvertSet) { char[] c = text.toCharArray(); for (int i = 0 ; i < c.length ; i++) { if (null != notConvertSet && notConvertSet.contains(c[i])) { @@ -857,7 +857,7 @@ public class Convert { if (c[i] == '\u3000') { c[i] = ' '; - } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') { + } else if (c[i] > '\uFF00' && c[i] < '⦅') { c[i] = (char) (c[i] - 65248); } } @@ -894,12 +894,12 @@ public class Convert { int integerPart = (int) Math.floor(n); for (int i = 0 ; i < unit[0].length && integerPart > 0 ; i++) { - String p = ""; + StringBuilder p = new StringBuilder(); for (int j = 0 ; j < unit[1].length && n > 0 ; j++) { - p = digit[integerPart % 10] + unit[1][j] + p; + p.insert(0, digit[integerPart % 10] + unit[1][j]); integerPart = integerPart / 10; } - s.insert(0, p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i]); + s.insert(0, p.toString().replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i]); } return head + s.toString().replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); }