From 3d44e0b30a04e6a7ce14d6db968ec158f87df614 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 十月 2024 17:00:46 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 f999d66..261e9c7 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
@@ -36,25 +36,29 @@
public static void setStrategyPrice(Map<Integer, TAccountingStrategyDetail> accountingStrategyDetails,AcquisitionBillingModeReply acquisitionBillingModeReply) {
accountingStrategyDetails.forEach((k,v)->{
BigDecimal electrovalence = v.getElectrovalence();
+ BigDecimal serviceCharge = v.getServiceCharge();
if(Objects.isNull(electrovalence)){
electrovalence = BigDecimal.ZERO;
+ }
+ if(Objects.isNull(serviceCharge)){
+ serviceCharge = BigDecimal.ZERO;
}
switch (k){
case 1:
acquisitionBillingModeReply.setSharp_peak_electricity_rate(electrovalence);
- acquisitionBillingModeReply.setSharp_peak_service_rate(new BigDecimal(0));
+ acquisitionBillingModeReply.setSharp_peak_service_rate(serviceCharge);
break;
case 2:
acquisitionBillingModeReply.setPeak_electricity_rate(electrovalence);
- acquisitionBillingModeReply.setPeak_service_rate(new BigDecimal(0));
+ acquisitionBillingModeReply.setPeak_service_rate(serviceCharge);
break;
case 3:
acquisitionBillingModeReply.setFlat_peak_electricity_rate(electrovalence);
- acquisitionBillingModeReply.setFlat_peak_service_rate(new BigDecimal(0));
+ acquisitionBillingModeReply.setFlat_peak_service_rate(serviceCharge);
break;
default:
acquisitionBillingModeReply.setLow_peak_electricity_rate(electrovalence);
- acquisitionBillingModeReply.setLow_peak_service_rate(new BigDecimal(0));
+ acquisitionBillingModeReply.setLow_peak_service_rate(serviceCharge);
break;
}
});
--
Gitblit v1.7.1