From 98445c8b495954499d9c042ed3255d23f31fb8ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 19:05:42 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 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 4bd5a2e..adf9fd5 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
@@ -236,10 +236,7 @@
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付金额减去退款金额
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
-
- }else if (tChargingOrder.getPaymentAmount()!=null){
+ if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}
// 累加订单金额
@@ -258,8 +255,9 @@
serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
}
// 累加平台手续费
- if (tChargingOrder.getCommissionAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getCommissionAmount());
+ if (tChargingOrder.getServiceCharge()!=null){
+ commissionAmount = commissionAmount.add(tChargingOrder.getServiceCharge().multiply(BigDecimal.valueOf(0.006))
+ .setScale(2,RoundingMode.HALF_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -312,9 +310,6 @@
chargingBillListVO.setChargingSecond(chargingSecond);
}
for (ChargingBillListVO chargingBillListVO : list1) {
-
-
-
LocalDateTime billTime = chargingBillListVO.getBillTime();
// 将其转化为yyyy-MM格式字符串
chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -343,14 +338,6 @@
eq.eq("site_id", chargingBillListVO.getSiteId());
}
List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
- int chargingSecond = 0;
- BigDecimal paymentAmount = 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");
orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
@@ -358,7 +345,7 @@
// 累加实收金额 支付金额减去退款金额
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
@@ -589,7 +576,7 @@
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付金额减去退款金额
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
@@ -610,8 +597,8 @@
serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
}
// 累加平台手续费
- if (tChargingOrder.getCommissionAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getCommissionAmount());
+ if (tChargingOrder.getServiceCharge()!=null){
+ commissionAmount = commissionAmount.add(tChargingOrder.getServiceCharge().multiply(BigDecimal.valueOf(0.006)).setScale(2,RoundingMode.HALF_DOWN));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -696,8 +683,8 @@
for (TChargingOrder tChargingOrder : tChargingOrders) {
// 累加实收金额 支付金额减去退款金额
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
--
Gitblit v1.7.1