|
|
@@ -1048,7 +1048,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
if(order.getCustomerNum().equals(0)){
|
|
|
order.setCustomerRate(BigDecimal.ZERO);
|
|
|
}else{
|
|
|
- BigDecimal decimal = new BigDecimal(order.getCustomerServiceNum()).divide(new BigDecimal(order.getCustomerNum()),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100.0)).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal decimal = new BigDecimal(order.getCustomerServiceNum()).multiply(new BigDecimal(100.0)).divide(new BigDecimal(order.getCustomerNum()),2,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
log.info("CustomerRate==="+decimal);
|
|
|
order.setCustomerRate(decimal);
|
|
|
}
|
|
|
@@ -1076,7 +1076,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
if(num == 0L){
|
|
|
rate.add(BigDecimal.ZERO);
|
|
|
}else {
|
|
|
- BigDecimal decimal2 = new BigDecimal(sum).divide(new BigDecimal(num), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100.0)).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal decimal2 = new BigDecimal(sum).multiply(new BigDecimal(100.0)).divide(new BigDecimal(num), 2, BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
rate.add(decimal2);
|
|
|
}
|
|
|
}
|