diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/report/service/impl/QueryReportServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/report/service/impl/QueryReportServiceImpl.java index 653a578d..58062e83 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/report/service/impl/QueryReportServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/report/service/impl/QueryReportServiceImpl.java @@ -712,8 +712,8 @@ public class QueryReportServiceImpl implements QueryReportService { Map map = new HashMap<>(4); if (callMap.containsKey(time)) { ReportDeduct reportDeduct = callMap.get(time); - map.put("balance", reportDeduct.getBalance()); - map.put("deductAmount", reportDeduct.getDeductAmount()); + map.put("balance", reportDeduct.getBalance() == null ? 0.0 : reportDeduct.getBalance() == null); + map.put("deductAmount", reportDeduct.getDeductAmount() == null ? 0.0 : reportDeduct.getDeductAmount()); } else { map.put("balance", 0); map.put("deductAmount", 0); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/ReportDeductsSync.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/ReportDeductsSync.java index f12fe9fb..8a69e75a 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/ReportDeductsSync.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/ReportDeductsSync.java @@ -59,10 +59,10 @@ public class ReportDeductsSync { List callDeducts; if (companyId != null) { callDeducts = callDeductRepository.queryByCompanyIdAndTime(companyId, beginOfDay, endOfDay); - Double sum = callDeducts.stream().mapToDouble(CallDeduct::getDeductAmount).sum(); + double sum = callDeducts.stream().mapToDouble(CallDeduct::getDeductAmount).sum(); ReportDeduct reportDeduct = new ReportDeduct(); reportDeduct.setDeductAmount(sum); - reportDeduct.setBalance(map.get(companyId)); + reportDeduct.setBalance(map.get(companyId) == null ? 0.0 : map.get(companyId)); reportDeduct.setCreateTime(new Date()); reportDeduct.setCompanyId(companyId); list.add(reportDeduct); @@ -71,7 +71,7 @@ public class ReportDeductsSync { Map> collect = callDeducts.stream().collect(Collectors.groupingBy(CallDeduct::getCompanyId, Collectors.toList())); for (Long key : map.keySet()) { ReportDeduct reportDeduct = new ReportDeduct(); - reportDeduct.setBalance(map.get(key)); + reportDeduct.setBalance(map.get(key) == null ? 0.0 : map.get(key)); reportDeduct.setCreateTime(new Date()); reportDeduct.setCompanyId(key); List callDeducts1 = collect.get(key); diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java index c31d50dc..5a86388f 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java @@ -431,14 +431,13 @@ public class ReportTokerServiceImpl implements ReportTokerService { map.put("usrNumRate", reportTokerCall.getUsrNumRate()); map.put("turnOnNum", reportTokerCall.getTurnOnNum()); map.put("turnOnRate", reportTokerCall.getTurnOnRate()); - map.put("time", time); } else { map.put("usrNum", 0); map.put("usrNumRate", 0.0); map.put("turnOnNum", 0); map.put("turnOnRate", 0.0); - map.put("time", time); } + map.put("time", time); maps.add(map); } return CommonResponse.createBySuccess(maps);