From 65a32f5cd03572b5c3606172149de7a2b4a56f20 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:52:34 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 7 +++++--
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 10 +++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 7939f1f..a378941 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1863,13 +1863,16 @@
if(StringUtils.hasLength(time)){
//充电度数
Object invoke = clazz.getMethod("getSharp_peak_charge" + (i + 1)).invoke(vo);
+ if(null == invoke || invoke.toString().equals("0")){
+ continue;
+ }
BigDecimal Sharp_peak_charge = new BigDecimal(invoke.toString());
//充电金额
Object invoke1 = clazz.getMethod("getSharp_peak_amount" + (i + 1)).invoke(vo);
BigDecimal sharp_peak_amount = new BigDecimal(invoke1.toString());
- String[] split = time.split("~");
- AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[1]) && s.getEndTime().equals(split[2])).findFirst().get();
+ String[] split = time.split("-");
+ AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[0]) && s.getEndTime().equals(split[1])).findFirst().get();
TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 2e982a7..47ab9fd 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -641,19 +641,19 @@
charging_pile_account.t_app_user
WHERE
del_flag = 0
- <if test="statisticsQueryDto.dayType =1 ">
+ <if test="statisticsQueryDto.dayType ==1 ">
AND DATE(create_time) = CURDATE()
</if>
- <if test="statisticsQueryDto.dayType =2 ">
+ <if test="statisticsQueryDto.dayType == 2 ">
AND WEEKOFYEAR(create_time) = WEEKOFYEAR(CURDATE())
</if>
- <if test="statisticsQueryDto.dayType =3 ">
+ <if test="statisticsQueryDto.dayType == 3 ">
AND MONTH(create_time) = MONTH(CURDATE())
</if>
- <if test="statisticsQueryDto.dayType =4">
+ <if test="statisticsQueryDto.dayType == 4">
AND YEAR(create_time) = YEAR(CURDATE())
</if>
- <if test="statisticsQueryDto.dayType =5">
+ <if test="statisticsQueryDto.dayType == 5">
<if test="statisticsQueryDto.startTime != null">
AND create_time >= #{statisticsQueryDto.startTime}
</if>
--
Gitblit v1.7.1