diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java index e2dec729..c535b5de 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java @@ -85,14 +85,15 @@ public class CallCostServiceImpl implements CallCostService { log.info(" 用户 {} ,没有通话记录", userId); continue; } - long durationTotal = list.stream().mapToLong(UserReport::getBreatheTotalDuration).sum(); + //s->m + long durationTotal = list.stream().mapToLong(UserReport::getBreatheTotalDuration).sum() / 60; //今天的通话记录 List userReports = list.stream().filter(c -> DateTimeUtil.betweenByDay(c.getCreateTime(), DateUtil.date())).collect(Collectors.toList()); if (durationTotal > callDuration && userReports.size() > 0) { - //今天得通话时长 - long durationToday = userReports.get(0).getBreatheTotalDuration(); + //今天得通话时长(s->m) + long durationToday = userReports.get(0).getBreatheTotalDuration() / 60; //账户余额 CompanyDto companyById = companyService.findCompanyById(companyId); @@ -219,7 +220,11 @@ public class CallCostServiceImpl implements CallCostService { sumTimes++; } } - return NumberUtil.mul((double) (sumScore / sumTimes), price.doubleValue()); + double estimateAmountToDay = 0.00; + if (sumTimes > 0) { + estimateAmountToDay = (double) sumScore / sumTimes / 60; + } + return NumberUtil.mul(estimateAmountToDay, price.doubleValue()); } }