From ae76f22f897cfd438b30829326b6ad36a80eaac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 二月 2025 18:23:13 +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 | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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 e098c87..584487f 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
@@ -184,6 +184,7 @@
@PutMapping("/export")
public void export(@RequestBody ChargingListQuery dto)
{
+
ChargingBillVO res = chargingBillService.chargingBillList(dto);
List<ChargingBillListVO> list = res.getList().getRecords();
List<TChargingBillExport> tChargingBillExports = new ArrayList<>();
@@ -342,23 +343,18 @@
chargingBillExport.setSiteName(data.get(0).getName());
}
// // 根据账单的出账时间 查询上个月的充电订单
-// LocalDateTime localDate = byId.getBillTime().minusMonths(1);
+ LocalDateTime localDate = byId.getBillTime().minusMonths(1);
// // 账单周期
// // 获取 LocalDate 对象
// LocalDate date = localDate.toLocalDate();
// // 获取该月份的第一天
// LocalDate firstDayOfMonth = date.withDayOfMonth(1);
- LocalDateTime localDate = byId.getBillTime().minusDays(1);
- // todo 临时修改为前一天
// 获取 LocalDate 对象
LocalDate date = localDate.toLocalDate();
-// // 获取该月份的第一天
-// LocalDate firstDayOfMonth = date.withDayOfMonth(1);
-// // 获取该月份的最后一天
-// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
- // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
- LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
+ // 获取该月份的第一天
+ LocalDate firstDayOfMonth = date.withDayOfMonth(1);
+ // 获取该月份的最后一天
+ LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
// 获取该月份的最后一天
// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
@@ -382,7 +378,7 @@
for (TChargingOrder tChargingOrder : tChargingOrders) {
// 账单信息
paymentAmount = paymentAmount.add(tChargingOrder.getRechargeAmount());
- commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(bigDecimal1).setScale(2, BigDecimal.ROUND_DOWN));
+ commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(bigDecimal1).setScale(2, BigDecimal.ROUND_DOWN));
sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount()!=null?tChargingOrder.getSharingAmount():new BigDecimal("0"));
// 退款信息
ChargingBillRefundExport chargingBillRefundExport = new ChargingBillRefundExport();
--
Gitblit v1.7.1