From ea4e6cf0a63fa8470846fd5188da9e912faf661e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 10:01:24 +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/service/impl/TChargingBillServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 9d59216..bb69665 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
@@ -91,6 +91,7 @@
chargingBillVO.setOrderCount(list1.size());
BigDecimal paymentAmountTotal = new BigDecimal("0");
BigDecimal orderAmountTotal = new BigDecimal("0");
+ BigDecimal refundAmountTotal = new BigDecimal("0");
BigDecimal electrovalenceTotal = new BigDecimal("0");
BigDecimal serviceChargeTotal = new BigDecimal("0");
BigDecimal commissionAmountTotal = new BigDecimal("0");
@@ -364,6 +365,7 @@
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}
+
// 累加订单金额
if (tChargingOrder.getOrderAmount()!=null){
orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount());
@@ -372,8 +374,10 @@
if (tChargingOrder.getElectrovalence()!=null){
electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
}
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus()!=null&& tChargingOrder.getRefundStatus()==2){
- refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
+ List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId())
+ .eq(TChargingOrderRefund::getRefundStatus, 2).list();
+ for (TChargingOrderRefund tChargingOrderRefund : list2) {
+ refundAmountTotal =refundAmountTotal.add(tChargingOrder.getRefundAmount());
}
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
@@ -410,7 +414,7 @@
chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setDiscount(discountTotal);
-
+ chargingBillVO.setRefundAmount(refundAmountTotal);
pageInfo.setRecords(list);
chargingBillVO.setList(pageInfo);
--
Gitblit v1.7.1