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 e61ee17e5..0f71e823d 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 @@ -21,6 +21,9 @@ public class OrderTotalDataVO { // 总用电量 private BigDecimal sumUsedElectricity; + // 总实收金额 + private BigDecimal sumActualReceivedAmount; + // 总结算金额 private BigDecimal sumSettleAmount; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 8175eadd4..842606b97 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -1952,6 +1952,7 @@ select IFNULL(sum(t1.order_amount),0) as sumOrderAmount, IFNULL(sum(t4.total_used_electricity),0) as sumUsedElectricity, + IFNULL(sum(t1.actual_received_amount), 0) as sumActualReceivedAmount, IFNULL(sum(t1.settle_amount),0) as sumSettleAmount from order_basic_info t1 left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'