|
|
@@ -2,6 +2,7 @@ package com.ruoyi.common.core.text;
|
|
2
|
2
|
|
|
3
|
3
|
import java.math.BigDecimal;
|
|
4
|
4
|
import java.math.BigInteger;
|
|
|
5
|
+import java.math.RoundingMode;
|
|
5
|
6
|
import java.nio.ByteBuffer;
|
|
6
|
7
|
import java.nio.charset.Charset;
|
|
7
|
8
|
import java.text.NumberFormat;
|
|
|
@@ -983,7 +984,12 @@ public class Convert
|
|
983
|
984
|
String s = "";
|
|
984
|
985
|
for (int i = 0; i < fraction.length; i++)
|
|
985
|
986
|
{
|
|
986
|
|
- s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
|
|
|
987
|
+ // 优化double计算精度丢失问题
|
|
|
988
|
+ BigDecimal nNum = new BigDecimal(n);
|
|
|
989
|
+ BigDecimal decimal = new BigDecimal(10);
|
|
|
990
|
+ BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN);
|
|
|
991
|
+ double d = scale.doubleValue();
|
|
|
992
|
+ s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
|
|
987
|
993
|
}
|
|
988
|
994
|
if (s.length() < 1)
|
|
989
|
995
|
{
|