autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-11 01:28:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

totalElectricity = sumUsedElectricity与totalElectricity, 取最大的值

Browse Source
This commit is contained in:
Guoqs
2025-01-21 11:07:04 +08:00
parent 7f347f2bae
commit f53eb97c0f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

@@ -396,12 +396,13 @@ public abstract class AbstractProgramLogic implements InitializingBean {
BigDecimal sumUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity) BigDecimal sumUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity)
.add(flatUsedElectricity).add(valleyUsedElectricity); .add(flatUsedElectricity).add(valleyUsedElectricity);
// data中的总用电量 // data中的总用电量
BigDecimal totalElectricity = new BigDecimal(data.getTotalElectricity()); BigDecimal totalElectricity = new BigDecimal(StringUtils.isBlank(data.getTotalElectricity()) ? Constants.ZERO : data.getTotalElectricity());
if (sumUsedElectricity.compareTo(totalElectricity) != 0) { // if (sumUsedElectricity.compareTo(totalElectricity) != 0) {
// 汇总数据和data中数据不相等，取汇总的数据 // // 汇总数据和data中数据不相等，取汇总的数据
totalElectricity = sumUsedElectricity; // totalElectricity = sumUsedElectricity;
} // }
orderDetail.setTotalUsedElectricity(totalElectricity); // totalElectricity = sumUsedElectricity与totalElectricity, 取最大的值
orderDetail.setTotalUsedElectricity(totalElectricity.max(sumUsedElectricity));
// 订单总金额 // 订单总金额
orderDetail.setTotalOrderAmount(orderAmount); orderDetail.setTotalOrderAmount(orderAmount);
} catch (Exception e) { } catch (Exception e) {