From 73be7ff2317fea8194b7a6dc0452b64a511c7836 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 18:42:38 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 109 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 63 insertions(+), 46 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 e370bca..b97dde3 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
@@ -10,6 +10,7 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.model.TChargingOrder;
@@ -40,6 +41,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -78,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())){
@@ -101,12 +102,8 @@
BigDecimal sharingAmountTotal = new BigDecimal("0");
BigDecimal chargingCapacityTotal = new BigDecimal("0");
BigDecimal discountTotal = new BigDecimal("0");
- BigDecimal refundAmount = new BigDecimal("0");
int orderCount = 0;
for (ChargingBillListVO chargingBillListVO : list) {
- if (chargingBillListVO.getType()==2){
- continue;
- }
String temp = "";
String temp1 = "";
switch (chargingBillListVO.getType()){
@@ -157,12 +154,14 @@
List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
int chargingSecond = 0;
BigDecimal paymentAmount = new BigDecimal("0");
+ BigDecimal rechargeAmount = new BigDecimal("0");
BigDecimal orderAmount = new BigDecimal("0");
BigDecimal electrovalence = new BigDecimal("0");
BigDecimal serviceCharge = new BigDecimal("0");
BigDecimal commissionAmount = new BigDecimal("0");
BigDecimal sharingAmount = new BigDecimal("0");
BigDecimal chargingCapacity = new BigDecimal("0");
+ BigDecimal refundAmount = new BigDecimal("0");
orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
@@ -267,7 +266,7 @@
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付结算金额
if (tChargingOrder.getChargeAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getChargeAmount());
+ paymentAmount = paymentAmount.add(tChargingOrder.getRechargeAmount());
}
// 总金额
if (tChargingOrder.getOrderAmount()!=null){
@@ -276,6 +275,9 @@
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
+ }
+ if (tChargingOrder.getRechargeAmount()!=null){
+ rechargeAmount = rechargeAmount.add(tChargingOrder.getRechargeAmount());
}
List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2)
.eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).list();
@@ -290,7 +292,8 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006)));
+ commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006))
+ .setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -302,7 +305,6 @@
}
}
- exports.addAll(tChargingOrders);
// 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
int hours = chargingSecond / 3600;
int minutes = (chargingSecond % 3600) / 60;
@@ -314,19 +316,16 @@
chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
}
- chargingBillListVO.setOrderAmount(chargingBillVO.getPaymentAmount().subtract(chargingBillVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillVO.getRefundAmount()));
- chargingBillListVO.setPaymentAmount(paymentAmount);
- chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount.subtract(sharingAmount).subtract(commissionAmount));
+ chargingBillListVO.setPaymentAmount(rechargeAmount);
+ chargingBillListVO.setOrderAmount(paymentAmount == null?BigDecimal.ZERO:orderAmount.subtract(sharingAmount).subtract(commissionAmount));
chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount);
chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
- chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setSharingAmount(sharingAmount == null?BigDecimal.ZERO:sharingAmount);
chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
- chargingBillListVO.setBillMoney(chargingBillListVO.getPaymentAmount().subtract(chargingBillListVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillListVO.getRefundAmount()
- .subtract(commissionAmount).subtract(sharingAmount))
- .subtract(chargingBillListVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillListVO.getCommissionAmount())
- .subtract(chargingBillListVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillListVO.getSharingAmount()));
+ chargingBillListVO.setBillMoney(rechargeAmount.subtract(refundAmount==null?BigDecimal.ZERO:refundAmount)
+ .subtract(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN)).subtract(sharingAmount).setScale(2, BigDecimal.ROUND_DOWN));
switch (chargingBillListVO.getType()){
case 1:
chargingBillListVO.setSiteName("全站");
@@ -343,7 +342,12 @@
// 充电时间秒
chargingBillListVO.setChargingSecond(chargingSecond);
}
+ BigDecimal bigDecimal = new BigDecimal("0");
+
for (ChargingBillListVO chargingBillListVO : list1) {
+ if (chargingBillListVO.getType()==2){
+ continue;
+ }
LocalDateTime billTime = chargingBillListVO.getBillTime();
// 将其转化为yyyy-MM格式字符串
chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -373,12 +377,13 @@
eq.eq("site_id", chargingBillListVO.getSiteId());
}
List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
+ tChargingOrders1.addAll(tChargingOrders);
orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
if (tChargingOrder.getOrderAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getChargeAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getRechargeAmount());
}
// 累加订单金额
@@ -393,6 +398,11 @@
.eq(TChargingOrderRefund::getRefundStatus, 2).list();
for (TChargingOrderRefund tChargingOrderRefund : list2) {
refundAmountTotal =refundAmountTotal.add(tChargingOrderRefund.getRefundAmount());
+ tChargingOrder.setRefundAmount(tChargingOrderRefund.getRefundAmount());
+ tChargingOrder.setRefundContent(tChargingOrderRefund.getRefundReason());
+ tChargingOrder.setRefundCode(tChargingOrderRefund.getRefundCode());
+ tChargingOrder.setRefundTime1(DateUtils.localDateTimeToString(tChargingOrderRefund.getRefundTime()));
+ bigDecimal = bigDecimal.add(tChargingOrderRefund.getRefundAmount());
}
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
@@ -400,7 +410,8 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
+ commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
+ .setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -421,16 +432,20 @@
}
}
chargingBillVO.setChargingCapacity(chargingCapacityTotal);
- chargingBillVO.setPaymentAmount(paymentAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setPaymentAmount(paymentAmountTotal);
chargingBillVO.setOrderAmount(paymentAmountTotal.subtract(refundAmountTotal).subtract(commissionAmountTotal).subtract(sharingAmountTotal));
- chargingBillVO.setElectrovalence(electrovalenceTotal.setScale(2, RoundingMode.HALF_DOWN));
- chargingBillVO.setServiceCharge(serviceChargeTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setElectrovalence(electrovalenceTotal);
+ chargingBillVO.setServiceCharge(serviceChargeTotal);
chargingBillVO.setOrderCount(orderCount);
- chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
- chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setCommissionAmount(commissionAmountTotal);
+ 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;
@@ -629,8 +644,8 @@
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}
// 总金额
- if (tChargingOrder.getOrderAmount()!=null){
- orderAmount = orderAmount.add(tChargingOrder.getPaymentAmount());
+ if (tChargingOrder.getRechargeAmount()!=null){
+ orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
@@ -645,7 +660,8 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006)));
+ commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006))
+ .setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -663,13 +679,13 @@
// 格式化为字符串
String timeString = String.format("%d小时%d分钟%d秒", hours, minutes, seconds);
chargingBillVO.setChargingTime(timeString);
+ chargingBillListVO.setOrderAmount(orderAmount.subtract(refundAmount));
- chargingBillListVO.setPaymentAmount(orderAmount.subtract(commissionAmount).subtract(sharingAmount).setScale(2,RoundingMode.HALF_DOWN));
- chargingBillListVO.setOrderAmount(orderAmount);
+ chargingBillListVO.setPaymentAmount(chargingBillListVO.getOrderAmount().subtract(commissionAmount).subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setElectrovalence(electrovalence);
- chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,RoundingMode.HALF_DOWN));
- chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,RoundingMode.HALF_DOWN));
- chargingBillListVO.setSharingAmount(sharingAmount.setScale(2,RoundingMode.HALF_DOWN));
+ chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,BigDecimal.ROUND_DOWN));
+ chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
+ chargingBillListVO.setSharingAmount(sharingAmount.setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setChargingCapacity(chargingCapacity);
switch (chargingBillListVO.getType()){
case 1:
@@ -688,7 +704,7 @@
chargingBillListVO.setChargingSecond(chargingSecond);
}
for (ChargingBillListVO chargingBillListVO : list1) {
- if (chargingBillListVO.getType() ==1){
+ if (chargingBillListVO.getType() ==2){
continue;
}
LocalDateTime billTime = chargingBillListVO.getBillTime();
@@ -737,9 +753,9 @@
paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}
// 累加订单金额
- if (tChargingOrder.getOrderAmount()!=null){
- orderAmount = orderAmount.add(tChargingOrder.getPaymentAmount());
- orderAmountTotal = orderAmountTotal.add(tChargingOrder.getPaymentAmount());
+ if (tChargingOrder.getRechargeAmount()!=null){
+ orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
+ orderAmountTotal = orderAmountTotal.add(tChargingOrder.getRechargeAmount());
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
@@ -756,8 +772,9 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")));
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")));
+ commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
+ commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
+ .setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -779,14 +796,14 @@
}
}
chargingBillVO.setChargingCapacity(chargingCapacityTotal);
- chargingBillVO.setPaymentAmount(orderAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal).setScale(2, RoundingMode.HALF_DOWN));
- chargingBillVO.setOrderAmount(orderAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
- chargingBillVO.setElectrovalence(electrovalenceTotal.setScale(2, RoundingMode.HALF_DOWN));
- chargingBillVO.setServiceCharge(serviceChargeTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setPaymentAmount(orderAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal).setScale(2, BigDecimal.ROUND_DOWN));
+ chargingBillVO.setOrderAmount(orderAmountTotal.setScale(2, BigDecimal.ROUND_DOWN));
+ chargingBillVO.setElectrovalence(electrovalenceTotal.setScale(2, BigDecimal.ROUND_DOWN));
+ chargingBillVO.setServiceCharge(serviceChargeTotal.setScale(2, BigDecimal.ROUND_DOWN));
chargingBillVO.setOrderCount(orderCount);
- chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
- chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
- chargingBillVO.setDiscount(discountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, BigDecimal.ROUND_DOWN));
+ chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, BigDecimal.ROUND_DOWN));
+ chargingBillVO.setDiscount(discountTotal.setScale(2, BigDecimal.ROUND_DOWN));
pageInfo.setRecords(list);
chargingBillVO.setList(pageInfo);
return chargingBillVO;
--
Gitblit v1.7.1