diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java index 25a34a9b..0d7c5596 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java @@ -115,10 +115,10 @@ public class SummaryServiceImpl implements SummaryService { count.put("unitPrice",saleAmount.divide(new BigDecimal(orderMap.get("saleNum").toString()),2,RoundingMode.DOWN)); } BigDecimal saleNum = new BigDecimal(orderMap.get("saleNum").toString()); - if(saleNum.compareTo(BigDecimal.ZERO) == 0){ - count.put("turnoverRate",BigDecimal.ZERO+"%");//翻台率 + if(saleNum.compareTo(BigDecimal.ZERO) == 0 || saleNum.compareTo(new BigDecimal(tables)) < 0){ + count.put("turnoverRate","0%");//翻台率 }else { - count.put("turnoverRate",saleNum.divide(new BigDecimal(tables),2,RoundingMode.DOWN).subtract(BigDecimal.ONE).multiply(new BigDecimal("100"))+"%");//翻台率 + count.put("turnoverRate",saleNum.divide(new BigDecimal(tables),0,RoundingMode.DOWN).subtract(BigDecimal.ONE).multiply(new BigDecimal("100"))+"%");//翻台率 } count.put("saveAmount",orderMap.get("saveAmount"));//优惠金额 count.put("saveNum",orderMap.get("saveNum"));//优惠单数