From 78ce7c4fe83a9ebb4c2a5a20bef19095c7943400 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 一月 2025 19:07:10 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index e5b683f..42363e3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1332,26 +1332,31 @@
uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.getOrderInfoByCodes(ids.toString()).getData();
}
+ List<Long> orderIds = list1.stream().map(TChargingOrder::getId).collect(Collectors.toList());
+ if(orderIds.isEmpty())orderIds.add(-1L);
+ List<TChargingOrderRefund> chargingOrderRefunds = chargingOrderRefundService.lambdaQuery()
+ .in(TChargingOrderRefund::getChargingOrderId, orderIds)
+ .eq(TChargingOrderRefund::getRefundStatus,2).list();
+ System.err.println("充电检测数据"+uploadRealTimeMonitoringData);
for (ChargingOrderVO chargingOrderVO : list1) {
paymentMoney= paymentMoney.add(chargingOrderVO.getPaymentAmount()!=null?chargingOrderVO.getPaymentAmount():new BigDecimal("0"));
commissionMoney = commissionMoney.add(chargingOrderVO.getOrderAmount()!=null?chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")):new BigDecimal("0"));
if (chargingOrderVO.getChargingCapacity()!=null){
total = total.add(chargingOrderVO.getElectricity()!=null?chargingOrderVO.getElectricity():new BigDecimal("0"));
}
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringData.stream().filter(e -> e.getTransaction_serial_number().equals(chargingOrderVO.getCode()))
+
+ UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringData.stream().filter(e -> e!=null&&e.getTransaction_serial_number()!=null&&(e.getTransaction_serial_number().equals(chargingOrderVO.getCode())))
.findFirst().orElse(null);
if (data5!=null && data5.getCumulative_charging_time()!=null){
long l = data5.getCumulative_charging_time() * 60L;
chargingOrderVO.setChargingSecond(l);
time+=l;
}
- List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2)
- .eq(TChargingOrderRefund::getChargingOrderId, chargingOrderVO.getId()).list();
+ List<TChargingOrderRefund> list2 = chargingOrderRefunds.stream().filter(e -> e.getChargingOrderId() != null && e.getChargingOrderId().equals(chargingOrderVO.getId()))
+ .collect(Collectors.toList());
for (TChargingOrderRefund tChargingOrderRefund : list2) {
- if (tChargingOrderRefund.getRefundStatus()==2){
refundMoney = refundMoney.add(tChargingOrderRefund.getRefundTotalAmount());
- }
}
electronicMoney = electronicMoney.add(chargingOrderVO.getElectrovalence()!=null?chargingOrderVO.getElectrovalence():new BigDecimal("0"));
serviceMoney = serviceMoney.add(chargingOrderVO.getServiceCharge()!=null?chargingOrderVO.getServiceCharge():new BigDecimal("0"));
--
Gitblit v1.7.1