Merge branch 'developer' into 'master'

Developer

See merge request !48

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java

@@ -105,8 +105,8 @@ public class IndexController {
         if(oldOrderCnt.isSuccess() && oldOrderCnt.getResult() != null){
             IndexMemberOldOrderCnt indexMemberOldOrderCnt = oldOrderCnt.getResult();
             consume.setOldRate(DataFormatUtils.rate(indexMemberOldOrderCnt.getOldCnt(), indexMemberOldOrderCnt.getAllCnt()));
-            Double oldRate = DataFormatUtils.divideDouble(indexMemberOldOrderCnt.getOldCnt(), indexMemberOldOrderCnt.getAllCnt());
-            Double hbRate = DataFormatUtils.divideDouble(indexMemberOldOrderCnt.getOldCntHb(), indexMemberOldOrderCnt.getAllCntHb());
+            Double oldRate = DataFormatUtils.rateDouble(indexMemberOldOrderCnt.getOldCnt(),indexMemberOldOrderCnt.getAllCnt());
+            Double hbRate = DataFormatUtils.rateDouble(indexMemberOldOrderCnt.getOldCntHb(), indexMemberOldOrderCnt.getAllCntHb());
             consume.setOldHb(DataFormatUtils.divide(oldRate, hbRate));
         }
         if(birthOrderCnt.isSuccess() && birthOrderCnt.getResult() != null){

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/utils/DataFormatUtils.java

@@ -251,6 +251,11 @@ public class DataFormatUtils {
         }
         return twoFormat(Double.valueOf(a) / Double.valueOf(b) * 100) + "%";
     }
-
+    public static Double rateDouble(Integer a, Integer b) {
+        if (b == null || b == 0) {
+            return 0d;
+        }
+        return Double.valueOf(a) / Double.valueOf(b);
+    }
 
 }