From ffde30c0425e95bd25a026374598aa02ef41c7a0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 20:58:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java | 1 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 10 +++++++++-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 2 +-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 2 ++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 156e598..84dfb2a 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -27,6 +27,8 @@
public class TChargingOrder extends BasePojo {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "累计退款金额 前端忽略")
+ private BigDecimal refundAmount1;
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.NONE)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
index 2000729..2f68bfb 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
@@ -50,4 +50,5 @@
private PageInfo<ChargingBillListVO> list;
@ApiModelProperty(value = "导出Excel数据 前端忽略")
private List<TChargingOrder> exportList;
+
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index d4bd89b..a4ff143 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -321,7 +321,7 @@
BigDecimal bigDecimal = new BigDecimal("0");
for (TChargingOrder chargingOrder : collect) {
- bigDecimal = bigDecimal.add(chargingOrder.getPaymentAmount());
+ bigDecimal = bigDecimal.add(chargingOrder.getRefundAmount());
if (chargingOrder.getRechargePaymentType()!=null){
switch (chargingOrder.getRechargePaymentType()){
case 1:
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..12dc444 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>
@@ -336,6 +337,8 @@
// 充电时间秒
chargingBillListVO.setChargingSecond(chargingSecond);
}
+ BigDecimal bigDecimal = new BigDecimal("0");
+
for (ChargingBillListVO chargingBillListVO : list1) {
if (chargingBillListVO.getType()==2){
continue;
@@ -394,6 +397,7 @@
tChargingOrder.setRefundContent(tChargingOrderRefund.getRefundReason());
tChargingOrder.setRefundCode(tChargingOrderRefund.getRefundCode());
tChargingOrder.setRefundTime1(DateUtils.localDateTimeToString(tChargingOrderRefund.getRefundTime()));
+ bigDecimal = bigDecimal.add(tChargingOrderRefund.getRefundAmount());
}
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
@@ -431,7 +435,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;
--
Gitblit v1.7.1