diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java index e4c25a9..013502f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java @@ -92,8 +92,12 @@ public class BusStoreDayHistoryInfoController extends BaseController }else{ excelInfo.setCommentsNumber(0); } - excelInfo.setPrice(storeInfo.getPrice().toString()); - BigDecimal money = new BigDecimal(storeInfo.getPrice().toString()).multiply(new BigDecimal(visitCount)); + BigDecimal d = new BigDecimal("0"); + if (storeInfo.getPrice() != null){ + d = storeInfo.getPrice(); + } + excelInfo.setPrice(d.toString()); + BigDecimal money = d.multiply(new BigDecimal(visitCount)); excelInfo.setMoney(money.toString()); totamMoney = totamMoney.add(money);