表结构修改

yzg-util-base/src/main/java/com/yanzuoguang/util/helper/CalcHelper.java

@@ -59,7 +59,7 @@ public class CalcHelper {
      * @return 结果
      */
     public static double addListDouble(Double d1, Double... d2) {
-        double ret = d1;
+        double ret = StringHelper.toDouble(d1);
         for (Double item : d2) {
             ret = addDouble(ret, item);
         }
@@ -113,7 +113,7 @@ public class CalcHelper {
      * @return 结果
      */
     public static double subListDouble(Double d1, Double... d2) {
-        double ret = d1;
+        double ret = StringHelper.toDouble(d1);
         for (Double item : d2) {
             ret = subDouble(ret, item);
         }
@@ -167,7 +167,7 @@ public class CalcHelper {
      * @return 结果
      */
     public static double mulListDouble(Double d1, Double... d2) {
-        double ret = d1;
+        double ret = StringHelper.toDouble(d1);
         for (Double item : d2) {
             ret = mulDouble(ret, item);
         }
@@ -248,7 +248,7 @@ public class CalcHelper {
      * @return 结果
      */
     public static double divListDouble(Double d1, Double... d2) {
-        double ret = d1;
+        double ret = StringHelper.toDouble(d1);
         for (Double item : d2) {
             ret = divDouble(ret, item);
         }

yzg-util-base/src/test/java/helper/TestCalc.java

@@ -36,6 +36,13 @@ public class TestCalc {
         CalcHelper.mulList(d1, d2, 0.5);
         CalcHelper.divList(d1, d2, 0.5);
 
+
+
+        CalcHelper.addListDouble((Double)null, d2, 0.3);
+        CalcHelper.subListDouble((Double)null, d2, 0.3);
+        CalcHelper.mulListDouble((Double)null, d2, 0.5);
+        CalcHelper.divListDouble((Double)null, d2, 0.5);
+
         double d4 = d1 + d2;
         Assert.assertFalse(CalcHelper.equals(d4, 0.3));
     }