From 951cd384e7b81eb7686e303f77992340cc91e6d1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 09:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 e1cf6a0..e72db84 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
@@ -80,6 +80,7 @@
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) {
String temp = "";
@@ -243,6 +244,9 @@
electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
}
+ if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() == 2){
+ refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
+ }
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
--
Gitblit v1.7.1