From 5f7db6fb9c1dbdcd3afeae55c444472303f0c9d3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 08 三月 2026 14:11:13 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index ec71e80..f39badd 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1865,16 +1865,10 @@
} else {
siteIds.add(statisticsQueryDto.getSiteId());
}
- LocalDateTime selectDate = statisticsQueryDto.getSelectDate();
- LocalDateTime min = selectDate.with(LocalTime.MIN);
- LocalDateTime max = selectDate.with(LocalTime.MAX);
-
- List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds)
- .between(TChargingOrder::getCreateTime, min, max).eq(TChargingOrder::getStatus,5).eq(TChargingOrder::getDelFlag, 0)
- .eq(TChargingOrder::getRechargePaymentStatus, 2)
- .eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list();
+ String format = statisticsQueryDto.getSelectDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Map<String, Object> stringObjectMap = chargingOrderService.getChargingOrderCount(siteIds, format);
//当日的订单总数
- int size = list.size();
+ int size = 0;
//计算list中paymentAmount的总和
BigDecimal totalPaymentAmount = BigDecimal.ZERO;
//计算list中electrovalence的总和
@@ -1883,21 +1877,12 @@
BigDecimal totalServiceCharge = BigDecimal.ZERO;
//计算list中charging_capacity的总和
BigDecimal totalChargingCapacity = BigDecimal.ZERO;
- List<TChargingOrderAccountingStrategy> accountingStrategyList = chargingOrderAccountingStrategyService.list();
- for (TChargingOrder order : list) {
- List<TChargingOrderAccountingStrategy> collect = accountingStrategyList.stream().filter(s -> s.getChargingOrderId().equals(order.getId())).collect(Collectors.toList());
- BigDecimal periodElectricPrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal periodServicePrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal chargingCapacity = collect.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
- totalElectrovalence = totalElectrovalence.add(periodElectricPrice);
- totalChargingCapacity = totalChargingCapacity.add(chargingCapacity);
- if(2 != order.getOrderSource()){
- totalServiceCharge = totalServiceCharge.add(periodServicePrice);
- totalPaymentAmount = totalPaymentAmount.add(periodElectricPrice).add(periodServicePrice);
- }else{
- totalServiceCharge = totalServiceCharge.add(periodServicePrice.multiply(new BigDecimal("0.8")));
- totalPaymentAmount = totalPaymentAmount.add(periodElectricPrice).add(periodServicePrice.multiply(new BigDecimal("0.8")));
- }
+ if(null != stringObjectMap){
+ size = Integer.parseInt(stringObjectMap.get("num").toString());
+ totalElectrovalence = new BigDecimal(stringObjectMap.get("electrovalence").toString());
+ totalServiceCharge = new BigDecimal(stringObjectMap.get("servicecharge").toString());
+ totalChargingCapacity = new BigDecimal(stringObjectMap.get("electricity").toString());
+ totalPaymentAmount = totalElectrovalence.add(totalServiceCharge);
}
TCharingWorkVO tCharingWorkVO = new TCharingWorkVO();
--
Gitblit v1.7.1