diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 006860fcc..f4b41086e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -298,6 +298,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { List list = selectOrderBasicInfoList(dto); BigDecimal sumOrderAmount = BigDecimal.ZERO; BigDecimal sumUsedElectricity = BigDecimal.ZERO; + BigDecimal sumSettleAmount = BigDecimal.ZERO; vo.setDateDescription(dto.getStartTime() + " - " + dto.getEndTime()); if (CollectionUtils.isNotEmpty(list)) { for (OrderListVO orderListVO : list) { @@ -310,10 +311,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { ? BigDecimal.ZERO : new BigDecimal(orderListVO.getChargingDegree()); sumUsedElectricity = sumUsedElectricity.add(chargingDegree); + + BigDecimal settleAmount = StringUtils.isBlank(orderListVO.getSettleAmount()) + ? BigDecimal.ZERO + : new BigDecimal(orderListVO.getSettleAmount()); + sumSettleAmount = sumSettleAmount.add(settleAmount); } } vo.setSumOrderAmount(sumOrderAmount); vo.setSumUsedElectricity(sumUsedElectricity); + vo.setSumSettleAmount(sumSettleAmount); return vo; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderTotalDataVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderTotalDataVO.java index dbc38956c..e61ee17e5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderTotalDataVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderTotalDataVO.java @@ -20,4 +20,7 @@ public class OrderTotalDataVO { // 总用电量 private BigDecimal sumUsedElectricity; + + // 总结算金额 + private BigDecimal sumSettleAmount; }