From 2e69129b4a26a0441581f0f1723454d1983b68b7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 46e04b6..a815719 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
@@ -1861,13 +1861,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());
--
Gitblit v1.7.1