From 2e05afc751a2a78edbc9268b5c210703a509b70b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 24 四月 2023 16:40:31 +0800
Subject: [PATCH] optimize bug
---
service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
index a0580bf..c876b6c 100644
--- a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
+++ b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
@@ -140,8 +140,13 @@
calendar.add(Calendar.MINUTE, -2); // 杩欓噷鍑忔帀涓ゅ垎閽燂紝璁惧鍙嶅簲閫氱煡骞冲彴鐨勬椂闂�
double usedHours = Math.ceil((calendar.getTime().getTime() - startTime.getTime()) / (60 * 60 * 1000.00));
+ // 璁＄畻骞冲潎鍔熺巼
+ String power = energy;
if (usedHours < 0) {
usedHours = 0;
+ }else{
+ BigDecimal powerDec = new BigDecimal(Double.parseDouble(energy)).divide(new BigDecimal(usedHours),2,BigDecimal.ROUND_HALF_UP);
+ power = powerDec.doubleValue()+"";
}
// todo 浼樻儬鍒告姷鎵�
@@ -151,13 +156,12 @@
remark = result.getString("remark");
}else{
remark = remark+";"+result.getString("remark");
-
}
ChargeRuleFeeDto chargeRuleFeeDto = new ChargeRuleFeeDto();
chargeRuleFeeDto.setRuleId(chargeMachineDto.getRuleId());
chargeRuleFeeDto.setCommunityId(chargeMachineDto.getCommunityId());
- chargeRuleFeeDto.setEnergy(energy);
+ chargeRuleFeeDto.setEnergy(power);
List<ChargeRuleFeeDto> chargeRuleFeeDtos = chargeRuleFeeV1InnerServiceSMOImpl.queryChargeRuleFees(chargeRuleFeeDto);
if (chargeRuleFeeDtos == null || chargeRuleFeeDtos.size() < 1) {
--
Gitblit v1.8.0