From 5456f2514aa2d338e7d4aaa85c4f781f4d042df3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 十月 2024 11:00:37 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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 e1dfdfd..0d4c102 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
@@ -1705,7 +1705,7 @@
chargingOrder.setChargingPower(divide);
chargingOrder.setCurrent(query.getOutput_current());
chargingOrder.setVoltage(query.getOutput_voltage());
- chargingOrder.setPower(query.getOutput_current().multiply(query.getOutput_voltage()));
+ chargingOrder.setPower(divide);
chargingOrder.setNeedElec(query.getOutput_current());
TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
@@ -1778,19 +1778,32 @@
try {
String time = (String) clazz.getMethod("getTime" + (i + 1)).invoke(vo);
if(StringUtils.hasLength(time)){
- //充电度数
- Object invoke = clazz.getMethod("getSharp_peak_charge" + (i + 1)).invoke(vo);
+ String[] split = time.split("-");
+ AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[0]) && s.getEndTime().equals(split[1])).findFirst().get();
+ //阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
+ Object invoke = null;
+ switch (strategyDetail.getType()){
+ case 1:
+ //充电度数
+ invoke = clazz.getMethod("getSharp_peak_charge" + (i + 1)).invoke(vo);
+ break;
+ case 2:
+ //充电度数
+ invoke = clazz.getMethod("getPeak_charge" + (i + 1)).invoke(vo);
+ break;
+ case 3:
+ //充电度数
+ invoke = clazz.getMethod("getFlat_peak_charge" + (i + 1)).invoke(vo);
+ break;
+ case 4:
+ //充电度数
+ invoke = clazz.getMethod("getLow_peak_charge" + (i + 1)).invoke(vo);
+ break;
+ }
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[0]) && s.getEndTime().equals(split[1])).findFirst().get();
-
TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
chargingOrderAccountingStrategy.setAccountingStrategyDetailId(strategyDetail.getId());
--
Gitblit v1.7.1