From 9dc7bcc2a92f5b4143bbc814ace40bafb386a949 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 07 一月 2025 19:00:03 +0800
Subject: [PATCH] 修改故障短信
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index 130149d..12dc444 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -41,6 +41,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -79,8 +80,7 @@
}
}
ChargingBillVO chargingBillVO = new ChargingBillVO();
- List<TChargingOrder> exports = new ArrayList<>();
-
+ List<TChargingOrder> tChargingOrders1 = new ArrayList<>();
String startTime1 = null;
String startTime2 = null;
if (StringUtils.hasLength(dto.getStartTime())){
@@ -300,7 +300,6 @@
}
}
- exports.addAll(tChargingOrders);
// 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
int hours = chargingSecond / 3600;
int minutes = (chargingSecond % 3600) / 60;
@@ -321,7 +320,7 @@
chargingBillListVO.setSharingAmount(sharingAmount == null?BigDecimal.ZERO:sharingAmount);
chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
chargingBillListVO.setBillMoney(paymentAmount.subtract(refundAmount==null?BigDecimal.ZERO:refundAmount)
- .subtract(commissionAmount).subtract(sharingAmount).setScale(2, BigDecimal.ROUND_DOWN));
+ .subtract(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN)).subtract(sharingAmount).setScale(2, BigDecimal.ROUND_DOWN));
switch (chargingBillListVO.getType()){
case 1:
chargingBillListVO.setSiteName("全站");
@@ -338,6 +337,8 @@
// 充电时间秒
chargingBillListVO.setChargingSecond(chargingSecond);
}
+ BigDecimal bigDecimal = new BigDecimal("0");
+
for (ChargingBillListVO chargingBillListVO : list1) {
if (chargingBillListVO.getType()==2){
continue;
@@ -371,6 +372,7 @@
eq.eq("site_id", chargingBillListVO.getSiteId());
}
List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
+ tChargingOrders1.addAll(tChargingOrders);
orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
@@ -395,6 +397,7 @@
tChargingOrder.setRefundContent(tChargingOrderRefund.getRefundReason());
tChargingOrder.setRefundCode(tChargingOrderRefund.getRefundCode());
tChargingOrder.setRefundTime1(DateUtils.localDateTimeToString(tChargingOrderRefund.getRefundTime()));
+ bigDecimal = bigDecimal.add(tChargingOrderRefund.getRefundAmount());
}
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
@@ -432,7 +435,11 @@
chargingBillVO.setSharingAmount(sharingAmountTotal);
chargingBillVO.setDiscount(discountTotal);
chargingBillVO.setRefundAmount(refundAmountTotal);
-
+ List<TChargingOrder> collect = tChargingOrders1.stream().distinct().collect(Collectors.toList());
+ if (!collect.isEmpty()){
+ collect.get(0).setRefundAmount1(bigDecimal);
+ }
+ chargingBillVO.setExportList(collect);
pageInfo.setRecords(list);
chargingBillVO.setList(pageInfo);
return chargingBillVO;
--
Gitblit v1.7.1