|
@@ -1617,8 +1617,6 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
if(order.getQualifiedRate() == null){
|
|
if(order.getQualifiedRate() == null){
|
|
|
order.setQualifiedRate(new BigDecimal("0.00"));
|
|
order.setQualifiedRate(new BigDecimal("0.00"));
|
|
|
}
|
|
}
|
|
|
- BigDecimal satisfaction = order.getSatisfactionRate().multiply(new BigDecimal(order.getOrderNum())).divide(new BigDecimal("100.0"),2,BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- BigDecimal qualified = order.getQualifiedRate().multiply(new BigDecimal(order.getOrderNum())).divide(new BigDecimal("100.0"),2,BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
order.setOrderNum(orderStatisticsData.getOrderNum());
|
|
order.setOrderNum(orderStatisticsData.getOrderNum());
|
|
|
order.setVisitNum(orderStatisticsData.getVisitNum());
|
|
order.setVisitNum(orderStatisticsData.getVisitNum());
|
|
|
order.setVisitRate(orderStatisticsData.getVisitRate());
|
|
order.setVisitRate(orderStatisticsData.getVisitRate());
|
|
@@ -1626,7 +1624,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
order.setSatisfactionRate(new BigDecimal("0.00"));
|
|
order.setSatisfactionRate(new BigDecimal("0.00"));
|
|
|
order.setQualifiedRate(new BigDecimal("0.00"));
|
|
order.setQualifiedRate(new BigDecimal("0.00"));
|
|
|
}else{
|
|
}else{
|
|
|
- BigDecimal addSatisfaction = satisfaction.add(new BigDecimal(orderStatisticsData.getSatisfactionNum()));
|
|
|
|
|
|
|
+ BigDecimal addSatisfaction = new BigDecimal(orderStatisticsData.getSatisfactionNum());
|
|
|
if(order.getOrderNum() == null || order.getOrderNum().equals(0)){
|
|
if(order.getOrderNum() == null || order.getOrderNum().equals(0)){
|
|
|
order.setSatisfactionRate(new BigDecimal("0.00"));
|
|
order.setSatisfactionRate(new BigDecimal("0.00"));
|
|
|
order.setQualifiedRate(new BigDecimal("0.00"));
|
|
order.setQualifiedRate(new BigDecimal("0.00"));
|
|
@@ -1635,7 +1633,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
if(order.getSatisfactionRate().compareTo(new BigDecimal(100))>0){
|
|
if(order.getSatisfactionRate().compareTo(new BigDecimal(100))>0){
|
|
|
order.setSatisfactionRate(new BigDecimal(100));
|
|
order.setSatisfactionRate(new BigDecimal(100));
|
|
|
}
|
|
}
|
|
|
- BigDecimal addQualified = qualified.add(new BigDecimal(orderStatisticsData.getQualifiedNum()));
|
|
|
|
|
|
|
+ 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));
|
|
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){
|
|
if(order.getQualifiedRate().compareTo(new BigDecimal(100))>0){
|
|
|
order.setQualifiedRate(new BigDecimal(100));
|
|
order.setQualifiedRate(new BigDecimal(100));
|