From 6782b2c9b3f4bbc0572ec22839da878f65e1ebd0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 17:57:44 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 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 90c3b81..59c83c7 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
@@ -65,6 +65,13 @@
private AppUserCarClient appUserCarClient;
@Override
public ChargingBillVO chargingBillList1(ChargingListQuery dto) {
+ if (dto.getState()!=null){
+ if (dto.getState()==1){
+ dto.setState(2);
+ }else {
+ dto.setState(1);
+ }
+ }
ChargingBillVO chargingBillVO = new ChargingBillVO();
String startTime1 = null;
String startTime2 = null;
@@ -319,8 +326,9 @@
chargingBillVO.setBillWeek(billTime.minusMonths(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
chargingBillListVO.setUid(chargingBillListVO.getId().toString());
- // 根据账单的出账时间 查询上个月的充电订单
- LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
+// LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
+ // todo 临时修改为查询昨天的充电订单
+ LocalDateTime localDate = chargingBillListVO.getBillTime().minusDays(1);
// 账单周期
chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
// 获取 LocalDate 对象
@@ -360,7 +368,7 @@
if (tChargingOrder.getElectrovalence()!=null){
electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
}
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() == 2){
+ if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus()!=null&& tChargingOrder.getRefundStatus()==2){
refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
}
// 累加累计服务费
@@ -406,6 +414,13 @@
}
@Override
public ChargingBillVO chargingBillList(ChargingListQuery dto) {
+ if (dto.getState()!=null){
+ if (dto.getState()==1){
+ dto.setState(2);
+ }else {
+ dto.setState(1);
+ }
+ }
ChargingBillVO chargingBillVO = new ChargingBillVO();
String startTime1 = null;
String startTime2 = null;
@@ -487,6 +502,7 @@
BigDecimal chargingCapacity = new BigDecimal("0");
orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
+ chargingBillListVO.setOrderCount(tChargingOrders.size());
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
List<Site> data = siteClient.getSiteByIds(Arrays.asList(tChargingOrder.getSiteId())).getData();
--
Gitblit v1.7.1