From 0de268c679fab7e3e6d4caaa1b1e79df0fefc4c6 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 8 Aug 2025 13:18:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E9=A6=96=E9=A1=B5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 3 ++- .../main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java | 5 +++++ .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) 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 ea1aea25a..deb9b7552 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 @@ -3020,7 +3020,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { List orderCodeList = Lists.newArrayList(); for (IndexOrderInfoVO indexOrderInfoVO : entry.getValue()) { - totalOrderAmount = totalOrderAmount.add(new BigDecimal(indexOrderInfoVO.getTotalOrderAmount())); + // totalOrderAmount = totalOrderAmount.add(new BigDecimal(indexOrderInfoVO.getTotalOrderAmount())); + totalOrderAmount = totalOrderAmount.add(new BigDecimal(indexOrderInfoVO.getTotalSettleAmount())); totalElectricity = totalElectricity.add(new BigDecimal(indexOrderInfoVO.getTotalElectricity())); orderCodeList.addAll(Lists.newArrayList(StringUtils.split(indexOrderInfoVO.getOrderCodes(), ","))); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java index ab5a7033c..0b4d34fe4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java @@ -30,6 +30,11 @@ public class IndexOrderInfoVO { */ private String totalOrderAmount; + /** + * 总结算金额 + */ + private String totalSettleAmount; + /** * 尖时段总用电量 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index c1563c0d6..6007e58f3 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2970,6 +2970,7 @@ SELECT trade_date AS date, order_codes as orderCodes, use_electricity AS totalElectricity, + settle_amount as totalSettleAmount, total_amount as totalOrderAmount from settle_order_report where del_flag = '0'