From ef8b70768d8d1c60a26828507e84894a1e5d7fd3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 10:31:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
index 4fa0440..1ae5c06 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -292,7 +292,7 @@
int i =1;
for (TChargingOrder tChargingOrder : tChargingOrders) {
// 账单信息
- paymentAmount = paymentAmount.add(tChargingOrder.getOrderAmount());
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
// 退款信息
ChargingBillRefundExport chargingBillRefundExport = new ChargingBillRefundExport();
@@ -354,13 +354,11 @@
String name = data1.get(0).getName();
chargingBillExport.setSiteName(name);
}
-
}
chargingBillExport.setPaymentAmount(paymentAmount);
chargingBillExport.setRefundAmount(refundAmount);
chargingBillExport.setIncome(paymentAmount.subtract(refundAmount));
chargingBillExports.add(chargingBillExport);
-
// 导出
List<Map<String, Object>> sheetsList = new ArrayList<>();
for (int i1 = 1; i1 <= 3; i1++) {
--
Gitblit v1.7.1