diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index c50463cc4..43101321f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -747,16 +747,21 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { // 电费金额, 如果splitRecordMap中存在,取Rrecord.getElectricitySplitAmount(), 如果不存在取vo.getTotalElectricityAmount() OrderSplitRecord record = splitRecordMap.get(vo.getOrderCode()); - BigDecimal electricityAmount = record != null - ? record.getElectricitySplitAmount() - : vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO; + BigDecimal electricityAmount; + BigDecimal serviceAmount; // BigDecimal e = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO; + if (record != null) { + electricityAmount = record.getElectricitySplitAmount() != null ? record.getElectricitySplitAmount() : BigDecimal.ZERO; + serviceAmount = record.getServiceSplitAmount() != null ? record.getServiceSplitAmount() : BigDecimal.ZERO; + log.info("record订单编号:{}, 订单金额:{}, 电费金额:{}, 服务费金额:{}", vo.getOrderCode(), orderAmount, electricityAmount, serviceAmount); + } else { + electricityAmount = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO; + serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO; + log.info("vo订单编号:{}, 订单金额:{}, 电费金额:{}, 服务费金额:{}", vo.getOrderCode(), orderAmount, electricityAmount, serviceAmount); + } totalElectricityAmount = totalElectricityAmount.add(electricityAmount); // 服务费金额,如果splitRecordMap中存在,取Rrecord.getElectricitySplitAmount(), 如果不存在取vo.getTotalElectricityAmount() - BigDecimal serviceAmount = record != null - ? record.getServiceSplitAmount() - : vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO; // BigDecimal serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO; totalServiceAmount = totalServiceAmount.add(serviceAmount);