From 0025eb9f90d01c16c46285d23aff174c95e60890 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 5 Aug 2025 10:39:48 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E9=87=91=E9=A2=9D=E6=8D=A2=E4=B8=BA=E5=AE=9E=E6=94=B6?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/pile/vo/web/OrderTotalDataVO.java | 3 +++ .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 1 + 2 files changed, 4 insertions(+) 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'