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 | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 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 3f5c27d..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
@@ -41,6 +41,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -153,6 +154,7 @@
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");
@@ -264,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){
@@ -273,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();
@@ -287,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){
@@ -310,7 +316,7 @@
chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
}
- chargingBillListVO.setPaymentAmount(paymentAmount);
+ 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);
@@ -318,7 +324,7 @@
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(paymentAmount.subtract(refundAmount==null?BigDecimal.ZERO:refundAmount)
+ 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:
@@ -336,6 +342,8 @@
// 充电时间秒
chargingBillListVO.setChargingSecond(chargingSecond);
}
+ BigDecimal bigDecimal = new BigDecimal("0");
+
for (ChargingBillListVO chargingBillListVO : list1) {
if (chargingBillListVO.getType()==2){
continue;
@@ -375,7 +383,7 @@
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
if (tChargingOrder.getOrderAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getChargeAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getRechargeAmount());
}
// 累加订单金额
@@ -394,6 +402,7 @@
tChargingOrder.setRefundContent(tChargingOrderRefund.getRefundReason());
tChargingOrder.setRefundCode(tChargingOrderRefund.getRefundCode());
tChargingOrder.setRefundTime1(DateUtils.localDateTimeToString(tChargingOrderRefund.getRefundTime()));
+ bigDecimal = bigDecimal.add(tChargingOrderRefund.getRefundAmount());
}
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
@@ -401,7 +410,8 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")));
+ commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
+ .setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -431,7 +441,11 @@
chargingBillVO.setSharingAmount(sharingAmountTotal);
chargingBillVO.setDiscount(discountTotal);
chargingBillVO.setRefundAmount(refundAmountTotal);
- chargingBillVO.setExportList(tChargingOrders1);
+ 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;
@@ -630,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){
@@ -646,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){
@@ -664,9 +679,9 @@
// 格式化为字符串
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,BigDecimal.ROUND_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,BigDecimal.ROUND_DOWN));
chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
@@ -689,7 +704,7 @@
chargingBillListVO.setChargingSecond(chargingSecond);
}
for (ChargingBillListVO chargingBillListVO : list1) {
- if (chargingBillListVO.getType() ==1){
+ if (chargingBillListVO.getType() ==2){
continue;
}
LocalDateTime billTime = chargingBillListVO.getBillTime();
@@ -738,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){
@@ -757,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){
--
Gitblit v1.7.1