大屏每小时更新全部数据

src/main/java/com/poteviohealth/cgp/statistics/service/impl/OrderServiceImpl.java

@@ -1657,6 +1657,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
             if(orders == null || orders.isEmpty()){
                 continue;
             }
+
             for (Order order : orders) {
                 if(order.getVisitNum() == null){
                     order.setVisitNum(0);
@@ -1669,25 +1670,15 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
                 }
                 order.setVisitNum(orderStatisticsData.getVisitNum());
                 order.setVisitRate(orderStatisticsData.getVisitRate());
-                if(order.getOrderNum().equals(0)){
-                    order.setSatisfactionRate(new BigDecimal("0.00"));
-                    order.setQualifiedRate(new BigDecimal("0.00"));
-                }else{
-                    BigDecimal addSatisfaction = new BigDecimal(orderStatisticsData.getSatisfactionNum());
-                    if(order.getOrderNum() == null || order.getOrderNum().equals(0)){
-                        order.setSatisfactionRate(new BigDecimal("0.00"));
-                        order.setQualifiedRate(new BigDecimal("0.00"));
-                    }else{
-                        order.setSatisfactionRate(addSatisfaction.multiply(new BigDecimal("100.0")).divide(new BigDecimal(order.getOrderNum()),2,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP));
-                        if(order.getSatisfactionRate().compareTo(new BigDecimal(100))>0){
-                            order.setSatisfactionRate(new BigDecimal(100));
-                        }
-                        BigDecimal addQualified = new BigDecimal(orderStatisticsData.getQualifiedNum());
-                        order.setQualifiedRate(addQualified.divide(new BigDecimal(order.getOrderNum()),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0")).setScale(2,BigDecimal.ROUND_HALF_UP));
-                        if(order.getQualifiedRate().compareTo(new BigDecimal(100))>0){
-                            order.setQualifiedRate(new BigDecimal(100));
-                        }
-                    }
+                BigDecimal addSatisfaction = new BigDecimal(orderStatisticsData.getSatisfactionNum());
+                order.setSatisfactionRate(addSatisfaction.multiply(new BigDecimal("100.0")).divide(new BigDecimal(orderList.size()),2,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP));
+                if(order.getSatisfactionRate().compareTo(new BigDecimal(100))>0){
+                    order.setSatisfactionRate(new BigDecimal(100));
+                }
+                BigDecimal addQualified = new BigDecimal(orderStatisticsData.getQualifiedNum());
+                order.setQualifiedRate(addQualified.divide(new BigDecimal(orderList.size()),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0")).setScale(2,BigDecimal.ROUND_HALF_UP));
+                if(order.getQualifiedRate().compareTo(new BigDecimal(100))>0){
+                    order.setQualifiedRate(new BigDecimal(100));
                 }
             }
         }