From bbb448443ab183d3c967ea0b799bf38da86c2038 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 十月 2024 10:04:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
index e935937..f999d66 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
@@ -6,6 +6,7 @@
import lombok.extern.slf4j.Slf4j;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -34,22 +35,26 @@
*/
public static void setStrategyPrice(Map<Integer, TAccountingStrategyDetail> accountingStrategyDetails,AcquisitionBillingModeReply acquisitionBillingModeReply) {
accountingStrategyDetails.forEach((k,v)->{
+ BigDecimal electrovalence = v.getElectrovalence();
+ if(Objects.isNull(electrovalence)){
+ electrovalence = BigDecimal.ZERO;
+ }
switch (k){
case 1:
- acquisitionBillingModeReply.setSharp_peak_electricity_rate(v.getElectrovalence());
-// acquisitionBillingModeReply.setSharp_peak_service_rate(v.getServiceCharge());
+ acquisitionBillingModeReply.setSharp_peak_electricity_rate(electrovalence);
+ acquisitionBillingModeReply.setSharp_peak_service_rate(new BigDecimal(0));
break;
case 2:
- acquisitionBillingModeReply.setPeak_electricity_rate(v.getElectrovalence());
-// acquisitionBillingModeReply.setPeak_service_rate(v.getServiceCharge());
+ acquisitionBillingModeReply.setPeak_electricity_rate(electrovalence);
+ acquisitionBillingModeReply.setPeak_service_rate(new BigDecimal(0));
break;
case 3:
- acquisitionBillingModeReply.setFlat_peak_electricity_rate(v.getElectrovalence());
-// acquisitionBillingModeReply.setFlat_peak_service_rate(v.getServiceCharge());
+ acquisitionBillingModeReply.setFlat_peak_electricity_rate(electrovalence);
+ acquisitionBillingModeReply.setFlat_peak_service_rate(new BigDecimal(0));
break;
default:
- acquisitionBillingModeReply.setLow_peak_electricity_rate(v.getElectrovalence());
-// acquisitionBillingModeReply.setLow_peak_service_rate(v.getServiceCharge());
+ acquisitionBillingModeReply.setLow_peak_electricity_rate(electrovalence);
+ acquisitionBillingModeReply.setLow_peak_service_rate(new BigDecimal(0));
break;
}
});
--
Gitblit v1.7.1