From e8bb68306304857520874551eb7544a1140118f0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 19 十月 2024 13:37:10 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 6f08796..def8b9c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -325,7 +325,20 @@
chargingOrderInfoVO.setVehicleUse(data.get(0).getVehicleUse());
}
}
+ // 时段总服务费
+ BigDecimal bigDecimal = new BigDecimal("0");
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
+ for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
+ bigDecimal = bigDecimal.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
+ tChargingOrderAccountingStrategy.setVipDiscount(
+ tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice()
+ .subtract(tChargingOrderAccountingStrategy.getPeriodServicePrice())
+ );
+ tChargingOrderAccountingStrategy.setCouponDiscount(
+ tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice()
+ .subtract(tChargingOrderAccountingStrategy.getPeriodServicePrice())
+ );
+ }
chargingOrderInfoVO.setList(list);
return AjaxResult.success(chargingOrderInfoVO);
}
--
Gitblit v1.7.1