From 8d46ca1dd499b76436015df9780051dd29f819d6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 06 三月 2025 11:57:57 +0800
Subject: [PATCH] 引流平台
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 41 +++--------------------------------------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 16 ++++++++++++----
2 files changed, 15 insertions(+), 42 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 50c910b..f102abb 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
@@ -522,8 +522,12 @@
}
-
-
+ public static void main(String[] args) {
+ ;
+ System.err.println(Integer.parseInt("01"));
+ System.err.println(Integer.valueOf("01"));
+ ;
+ }
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -558,13 +562,13 @@
System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
- if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){
+ if (Integer.parseInt(split[0])>=Integer.parseInt(temp1)){
format = byId.getCreateTime().format(formatter);
}else {
format = byId.getEndTime().format(formatter);
}
String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
- if (Integer.parseInt(split1[0])<Integer.valueOf(temp1)){
+ if (Integer.parseInt(split1[0])<Integer.parseInt(temp1)){
format1 = byId.getCreateTime().format(formatter);
}else {
format1 = byId.getEndTime().format(formatter);
@@ -1136,7 +1140,11 @@
if (chargingOrderVO != null) {
BeanUtils.copyProperties(chargingOrderVO, dataDto);
}
+
BeanUtils.copyProperties(uploadRealTimeMonitoringData, dataDto);
+ if (chargingOrderVO != null && chargingOrderVO.getOrderSource()==2){
+ dataDto.setPeriod_service_price(uploadRealTimeMonitoringData.getPeriod_service_price().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_DOWN)));
+ }
dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime() == null ? null : uploadRealTimeMonitoringData.getEndTime());
dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
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 12334d1..7945e90 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
@@ -1318,24 +1318,8 @@
BigDecimal refundMoney = new BigDecimal("0");
BigDecimal paymentMoney = new BigDecimal("0");
List<Long> collect = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
- List<TChargingOrderAccountingStrategy> list3 = new ArrayList<>();
- if(collect.size()>=800){
- int i = collect.size() / 800;
- int k = collect.size() % 800;
- for (int j = 0; j <= i; j++) {
- if(j==i&& k>0){
- list3.addAll(chargingOrderAccountingStrategyService.lambdaQuery()
- .in(TChargingOrderAccountingStrategy::getChargingOrderId,collect.subList(j * 800, j * 800 + k)).list());
- }else {
- List<Long> longs = collect.subList(j * 800, (j + 1) * 800);
- list3.addAll(chargingOrderAccountingStrategyService.lambdaQuery()
- .in(TChargingOrderAccountingStrategy::getChargingOrderId,longs).list());
- }
- }
- }else {
- list3 = chargingOrderAccountingStrategyService.lambdaQuery()
- .in(TChargingOrderAccountingStrategy::getChargingOrderId,collect).list();
- }
+ List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
+
for (ChargingOrderVO chargingOrderVO : list) {
if (roleType == 2){
for (Integer siteId : siteIds) {
@@ -1774,26 +1758,7 @@
BigDecimal feng = new BigDecimal("0");
BigDecimal ping = new BigDecimal("0");
BigDecimal gu = new BigDecimal("0");
- List<Long> collect = list1.stream().map(ChargingOrderListVO::getId).collect(Collectors.toList());
- List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = new ArrayList<>();
- if(collect.size()>=800){
- int i = collect.size() / 800;
- int k = collect.size() % 800;
- for (int j = 0; j <= i; j++) {
- if(j==i&& k>0){
- chargingOrderAccountingStrategies.addAll(chargingOrderAccountingStrategyService.lambdaQuery()
- .in(TChargingOrderAccountingStrategy::getChargingOrderId,collect.subList(j * 800, j * 800 + k)).list());
- }else {
- List<Long> longs = collect.subList(j * 800, (j + 1) * 800);
- chargingOrderAccountingStrategies.addAll(chargingOrderAccountingStrategyService.lambdaQuery()
- .in(TChargingOrderAccountingStrategy::getChargingOrderId,longs).list());
- }
- }
- }else {
- chargingOrderAccountingStrategies = chargingOrderAccountingStrategyService.lambdaQuery()
- .in(TChargingOrderAccountingStrategy::getChargingOrderId,collect).list();
- }
-
+ List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = chargingOrderAccountingStrategyService.list();
for (ChargingOrderListVO chargingOrderListVO : list1) {
if (chargingOrderListVO.getChargingCapacity()!=null)electronic = electronic.add(chargingOrderListVO.getElectricity());
--
Gitblit v1.7.1