From 8a038cf6f0792cfe260a94e86d954b50f068e758 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 二月 2025 16:55:41 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 3e23724..6fce279 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -61,10 +61,13 @@
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -129,20 +132,27 @@
List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
List<ChargingOrderListVO> exportList = res.getExportList();
int i = 0;
+ List<Site> data9 = siteClient.getSiteAll().getData();
+ List<TChargingGun> data = chargingGunClient.getAllGun().getData();
+ List<TAppUser> data6 = appUserClient.getAllUser().getData();
+ List<Partner> data7 = siteClient.getAllPartner().getData();
+ List<AccountingStrategyOrder> listAll = accountingStrategyOrderService.lambdaQuery()
+ .list();
+ List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list(
+ );
for (ChargingOrderListVO chargingOrderListVO : exportList) {
TChargingOrderExport tChargingOrderExport = new TChargingOrderExport();
-
- List<Site> data = siteClient.getSiteByIds(Arrays.asList(chargingOrderListVO.getSiteId())).getData();
- TAppUser data3 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
- TChargingGun data4 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
- if (data!=null&&(!data.isEmpty())){
- tChargingOrderExport.setSiteCode(data.get(0).getCode());
+ Site site = data9.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
+ TAppUser data3 = data6.stream().filter(e->e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null);
+ TChargingGun data4 = data.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
+ if (site!=null){
+ tChargingOrderExport.setSiteCode(site.getCode());
tChargingOrderExport.setSiteName(chargingOrderListVO.getSiteName());
- tChargingOrderExport.setCity(data.get(0).getCity());
- tChargingOrderExport.setCityName(data.get(0).getDistricts());
- tChargingOrderExport.setSiteType(data.get(0).getSiteType());
- tChargingOrderExport.setStatus(data.get(0).getStatus()+"");
- Partner data2 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData();
+ tChargingOrderExport.setCity(site.getCity());
+ tChargingOrderExport.setCityName(site.getDistricts());
+ tChargingOrderExport.setSiteType(site.getSiteType());
+ tChargingOrderExport.setStatus(site.getStatus()+"");
+ Partner data2 = data7.stream().filter(e->e.getId().equals(site.getPartnerId())).findFirst().orElse(null);
if (data2!=null){
tChargingOrderExport.setPartner(data2.getName());
}
@@ -153,9 +163,9 @@
tChargingOrderExport.setCode(chargingOrderListVO.getCode());
tChargingOrderExport.setTerminalName(chargingOrderListVO.getTerminalName());
// 查询这笔订单的计费策略名称
- List<AccountingStrategyOrder> list = accountingStrategyOrderService.lambdaQuery()
- .eq(AccountingStrategyOrder::getChargingOrderId, chargingOrderListVO.getId())
- .list();
+ List<AccountingStrategyOrder> list = listAll.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList());
+
+
if (!list.isEmpty()){
tChargingOrderExport.setName(list.get(0).getName());
}
@@ -194,9 +204,7 @@
tChargingOrderExport.setServiceCharge(chargingOrderListVO.getServiceCharge()+"");
tChargingOrderExport.setTotal(chargingOrderListVO.getPaymentAmount()+"");
tChargingOrderExport.setChargingCapacity(chargingOrderListVO.getElectricity()+"");
- List<TChargingOrderAccountingStrategy> stageCost = tChargingOrderAccountingStrategyService.list(
- new LambdaQueryWrapper<TChargingOrderAccountingStrategy>()
- .eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderListVO.getId()));
+ List<TChargingOrderAccountingStrategy> stageCost = stageCostAll.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList());
if (!stageCost.isEmpty()){
// 累加时段电费单价 取平均值
BigDecimal bigDecimal1 = new BigDecimal("0");
@@ -216,12 +224,12 @@
tChargingOrderExport.setServiceChargePrice(divide2+"");
tChargingOrderExport.setServiceChargePriceLook(divide3+"");
}
- // 获取充电时间
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
- if (data5!=null){
- if (data5.getTime_remaining()!=null){
- tChargingOrderExport.setCumulativeChargingTime(data5.getCumulative_charging_time()+"");
- }
+ if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
+ LocalDateTime startTime = chargingOrderListVO.getStartTime();
+ LocalDateTime endTime = chargingOrderListVO.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ tChargingOrderExport.setCumulativeChargingTime((between*60)+"");
}
tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc());
tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc());
@@ -229,9 +237,8 @@
tChargingOrderExport.setIsSocType("");
tChargingOrderExport.setIsSocNum("0");
tChargingOrderExport.setUserType("普通个人用户");
- TAppUser data2 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
- if (data2!=null&&data2.getVipId()!=null){
- TVip data1 = vipClient.getInfo1(data2.getVipId()).getData();
+ if (data3!=null&&data3.getVipId()!=null){
+ TVip data1 = vipClient.getInfo1(data3.getVipId()).getData();
if (data1!=null){
tChargingOrderExport.setVipType(data1.getName());
}
--
Gitblit v1.7.1