From 7bf7e4c6656287b1b9005d58d6ec45e0da5d8dc4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 26 十月 2024 10:02:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 9b9210e..1a968ba 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
@@ -351,12 +351,12 @@
chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()!=null?byId.getTotalElectricity().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
chargingOrderInfoVO.setTotalPower(byId.getPower()!=null?byId.getPower().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
if (byId.getAppUserCarId()!=null){
- List<TAppUserCar> data = appUserCarClient.getCarByIds(Arrays.asList(byId.getAppUserCarId())).getData();
- if (!data.isEmpty()){
- chargingOrderInfoVO.setLicensePlate(data.get(0).getLicensePlate());
- chargingOrderInfoVO.setVehicleBrand(data.get(0).getVehicleBrand());
- chargingOrderInfoVO.setVehicleModel(data.get(0).getVehicleModel());
- chargingOrderInfoVO.setVehicleUse(data.get(0).getVehicleUse());
+ TAppUserCar data = appUserCarClient.getCarById(byId.getAppUserCarId()+"").getData();
+ if (data!=null){
+ chargingOrderInfoVO.setLicensePlate(data.getLicensePlate());
+ chargingOrderInfoVO.setVehicleBrand(data.getVehicleBrand());
+ chargingOrderInfoVO.setVehicleModel(data.getVehicleModel());
+ chargingOrderInfoVO.setVehicleUse(data.getVehicleUse());
}
}
// 时段总服务费
@@ -811,14 +811,16 @@
Map<String,ChargingOrderVO> map = new HashMap<>();
for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data1) {
ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
- BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
ChargingOrderQuery dto = new ChargingOrderQuery();
+ dto.setCode(uploadRealTimeMonitoringData.getTransaction_serial_number());
TCharingOrderVO vo = chargingOrderService.chargingOrder(dto);
if (!vo.getList().getRecords().isEmpty()) {
ChargingOrderVO chargingOrderVO = vo.getList().getRecords().get(0);
if (chargingOrderVO != null) {
BeanUtils.copyProperties(chargingOrderVO, dataDto);
}
+ BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
+
dtos.add(dataDto);
}else {
continue;
@@ -1134,7 +1136,10 @@
//查询各个分数
List<Map<String,Object>> evaluate = chargingOrderService.getLevelEvaluate(siteIds);
//查询差评回复数
- Long count = orderEvaluateService.lambdaQuery().isNotNull(TOrderEvaluate::getResponseTime).count();
+ List<Integer> mark = new ArrayList<>();
+ mark.add(1);
+ mark.add(2);
+ Long count = orderEvaluateService.lambdaQuery().in(TOrderEvaluate::getMark, mark).isNotNull(TOrderEvaluate::getResponseTime).count();
TCharingUserEvaluateVO tCharingUserEvaluateVO = new TCharingUserEvaluateVO();
tCharingUserEvaluateVO.setAver(aver);
tCharingUserEvaluateVO.setEvaluate(evaluate);
--
Gitblit v1.7.1