From e8aafd7e12f85b7f9c348de835c8e7ce22c89309 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 10:26:27 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 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 b992b12..6dbc74a 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
@@ -1080,31 +1080,36 @@
}
chargingOrderListInfoVO.setEndMode(chargingOrder.getEndMode());
// todo 周一完善
-// chargingOrderListInfoVO.setStartSoc();
-// chargingOrderListInfoVO.setEndSoc();
-// chargingOrderListInfoVO.setChargingCapacity();
-// chargingOrderListInfoVO.setSiteId();
-// chargingOrderListInfoVO.setChargingPileId();
-// chargingOrderListInfoVO.setAppUserId();
-// chargingOrderListInfoVO.setAppUserCarId();
-// chargingOrderListInfoVO.setChargingGunId();
-// chargingOrderListInfoVO.setOrderType();
-// chargingOrderListInfoVO.setChargingSecond();
-// chargingOrderListInfoVO.setLicensePlate();
-// chargingOrderListInfoVO.setPhone();
-// chargingOrderListInfoVO.setPaymentAmount();
-// chargingOrderListInfoVO.setElectrovalence();
-// chargingOrderListInfoVO.setServiceCharge();
-// chargingOrderListInfoVO.setStartTime();
-// chargingOrderListInfoVO.setEndTime();
-// chargingOrderListInfoVO.setId();
-// chargingOrderListInfoVO.setUid();
-// chargingOrderListInfoVO.setList();
+ // 获取开始SOC 结束soc
+ List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
+ if (!data6.isEmpty()){
+ // 第一条数据soc为开始 最后一条数据soc为结束soc
+ chargingOrderListInfoVO.setStartSoc(data6.get(0).getSoc().toString());
+ chargingOrderListInfoVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+ chargingOrderListInfoVO.setChargingCapacity(data6.get(data6.size()-1).getCharging_degree());
+ chargingOrderListInfoVO.setChargingSecond(data6.get(data6.size()-1).getCumulative_charging_time()*60+"");
-
- return null;
+ }
+ if (chargingOrder.getAppUserCarId()!=null){
+ List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(chargingOrder.getAppUserCarId())).getData();
+ if (!data3.isEmpty())chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
+ }
+ chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
+ chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
+ chargingOrderListInfoVO.setId(chargingOrder.getId());
+ chargingOrderListInfoVO.setUid(chargingOrder.getId().toString());
+ chargingOrderListInfoVO.setList(data6);
+ chargingOrderListInfoVO.setCouponDiscountAmount(chargingOrder.getCouponDiscountAmount());
+ chargingOrderListInfoVO.setVipDiscountAmount(chargingOrder.getVipDiscountAmount());
+ chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
+ chargingOrderListInfoVO.setCommissionAmount(chargingOrder.getCommissionAmount());
+ // 查询费用明细列表
+ List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery()
+ .eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId())
+ .list();
+ chargingOrderListInfoVO.setList1(list);
+ return chargingOrderListInfoVO;
}
-
/**
* 处理充电订单实时监控数据相关的业务逻辑
--
Gitblit v1.7.1