From a8996df2df6a108be7db1cdb42cee31e12d59245 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 十一月 2024 17:23:54 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 659389d..efc6208 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
@@ -376,7 +376,7 @@
}
bigDecimal = bigDecimal.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
- if (byId.getCouponDiscountAmount()!=null){
+ if (byId.getCouponDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
BigDecimal multiply = byId.getCouponDiscountAmount().divide(byId.getServiceCharge(), 2)
.multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
tChargingOrderAccountingStrategy.setCouponDiscount(multiply);
@@ -915,16 +915,13 @@
// 获取当前日期
LocalDate today = LocalDate.now();
start = statisticsQueryDto.getStartTime();
- end = statisticsQueryDto.getEndTime();
+ end = statisticsQueryDto.getEndTime().plusDays(1);
// 获取本月1号的日期
- YearMonth yearMonth = YearMonth.from(today);
// start = yearMonth.atDay(1);
//
// System.out.println("本月1号是: " + start);
}else if (statisticsQueryDto.getDayType()==4){
- LocalDate today = LocalDate.now();
- // 获取当前年份
- int currentYear = today.getYear();
+
// 获取今年1月1日的日期
start = statisticsQueryDto.getStartTime();
end = statisticsQueryDto.getEndTime();
@@ -933,7 +930,11 @@
// 获取今年1月1日的日期
start = statisticsQueryDto.getStartTime();
end = statisticsQueryDto.getEndTime();
+ if (start.equals(end)){
+ end = end.plusDays(1);
+ }
}
+
List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getCreateTime, start).le(TChargingOrder::getCreateTime, end).in(TChargingOrder::getSiteId, siteIds).list();
List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
chargingOrderIds.add(-1L);
@@ -1033,6 +1034,7 @@
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
+
List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
// 遍历日期范围
@@ -1063,6 +1065,8 @@
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
+
+
List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
// 遍历日期范围
--
Gitblit v1.7.1