Merge branch 'ww' into test

This commit is contained in:
wangw 2024-09-11 17:10:20 +08:00
commit c0bad61875
1 changed files with 3 additions and 3 deletions

View File

@ -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"));//优惠单数