From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/AcquisitionBillingModeReply.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/AcquisitionBillingModeReply.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/AcquisitionBillingModeReply.java
index 046b0ae..7b55b38 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/AcquisitionBillingModeReply.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/AcquisitionBillingModeReply.java
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.math.BigDecimal;
@@ -13,19 +14,19 @@
 @Data
 @Document(collection = "acquisition_billing_mode_reply") //指定要对应的文档名(表名)
 @Accessors(chain = true)
-public class AcquisitionBillingModeReply {
-
+public class AcquisitionBillingModeReply extends BaseModel {
     private String charging_pile_code;// 桩编码
     private String billing_model_code;// "计费模型编号
-    private BigDecimal sharp_peak_electricity_rate;// 尖费电费费率(精确到五位小数)
-    private BigDecimal sharp_peak_service_rate;// 尖服务费费率(精确到五位小数)
-    private BigDecimal peak_electricity_rate;// 峰电费费率(精确到五位小数)
-    private BigDecimal peak_service_rate;// 峰服务费费率(精确到五位小数)
-    private BigDecimal flat_peak_electricity_rate;// 平电费费率(精确到五位小数)
-    private BigDecimal flat_peak_service_rate;// 平服务费费率(精确到五位小数)
-    private BigDecimal low_peak_electricity_rate;// 谷电费费率(精确到五位小数)
-    private BigDecimal low_peak_service_rate;// 谷服务费费率(精确到五位小数)
+    private BigDecimal sharp_peak_electricity_rate = BigDecimal.ZERO;// 尖费电费费率(精确到五位小数)
+    private BigDecimal sharp_peak_service_rate = BigDecimal.ZERO;// 尖服务费费率(精确到五位小数)
+    private BigDecimal peak_electricity_rate = BigDecimal.ZERO;// 峰电费费率(精确到五位小数)
+    private BigDecimal peak_service_rate = BigDecimal.ZERO;// 峰服务费费率(精确到五位小数)
+    private BigDecimal flat_peak_electricity_rate = BigDecimal.ZERO;// 平电费费率(精确到五位小数)
+    private BigDecimal flat_peak_service_rate = BigDecimal.ZERO;// 平服务费费率(精确到五位小数)
+    private BigDecimal low_peak_electricity_rate = BigDecimal.ZERO;// 谷电费费率(精确到五位小数)
+    private BigDecimal low_peak_service_rate = BigDecimal.ZERO;// 谷服务费费率(精确到五位小数)
     private BigDecimal loss_ratio;// 计损比例
+//    private DayTimeBase day_time_base;
     private Integer time1;// 0:00~0:30 时段费率号(0:尖费率,1:峰费率,2:平费率,3:谷费率)
     private Integer time2;// 0:30~1:00 时段费率号(0:尖费率,1:峰费率,2:平费率,3:谷费率)
     private Integer time3;// 0:30~1:00 时段费率号(0:尖费率,1:峰费率,2:平费率,3:谷费率)

--
Gitblit v1.7.1