From de09da99330cf51bdab4934dae143a6cc72014d6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 26 十月 2024 11:26:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 1a968ba..b833c5b 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
@@ -804,7 +804,7 @@
// }
// Set<String> strings = map.keySet();
-
+ mongoChargingOrderQuery.setPageSize(10);
List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery).getData();
List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
@@ -820,13 +820,17 @@
BeanUtils.copyProperties(chargingOrderVO, dataDto);
}
BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
-
+ dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
+ dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime());
+ dataDto.setStatus(chargingOrderVO.getStatus());
dtos.add(dataDto);
}else {
continue;
}
}
-
+ for (int i = 0; i < dtos.size(); i++) {
+ dtos.get(i).setIndex(i);
+ }
return R.ok(dtos);
}
@@ -938,8 +942,16 @@
tCharingOrderMapVO.setMaps(maps);
+ BigDecimal allMoney = new BigDecimal(0);
+ for (Map<String, Object> map : maps) {
+ BigDecimal periodElectricPrice = (BigDecimal) map.get("period_electric_price");
+ allMoney = allMoney.add(periodElectricPrice);
+ BigDecimal total_amount = (BigDecimal) map.get("total_amount");
+ allMoney = allMoney.add(total_amount);
+ }
+ allMoney = allMoney.multiply(new BigDecimal("0.006"));
-
+ tCharingOrderMapVO.setAllMoney(allMoney);
return R.ok(tCharingOrderMapVO);
}
--
Gitblit v1.7.1