Merge branch 'developer' into 'master'

线上权限调整

See merge request !47

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

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