diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java
index dfa20a9b8..11d9ddf52 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java
@@ -59,6 +59,12 @@ public class OrderDetail extends BaseEntity {
@Excel(name = "服务费总金额", readConverterExp = "各=时段服务费总金额")
private BigDecimal totalServiceAmount;
+ /**
+ * 尖单价
+ */
+ @Excel(name = "尖单价")
+ private BigDecimal sharpPrice;
+
/**
* 尖时段用电量
*/
@@ -77,6 +83,18 @@ public class OrderDetail extends BaseEntity {
@Excel(name = "尖时段服务费单价")
private BigDecimal sharpServicePrice;
+ /**
+ * 尖金额
+ */
+ @Excel(name = "尖金额")
+ private BigDecimal sharpAmount;
+
+ /**
+ * 峰单价
+ */
+ @Excel(name = "峰单价")
+ private BigDecimal peakPrice;
+
/**
* 峰时段用电量
*/
@@ -95,6 +113,18 @@ public class OrderDetail extends BaseEntity {
@Excel(name = "峰时段服务费单价")
private BigDecimal peakServicePrice;
+ /**
+ * 峰金额
+ */
+ @Excel(name = "峰金额")
+ private BigDecimal peakAmount;
+
+ /***
+ * 平单价
+ */
+ @Excel(name = "平单价")
+ private BigDecimal flatPrice;
+
/**
* 平时段用电量
*/
@@ -113,6 +143,18 @@ public class OrderDetail extends BaseEntity {
@Excel(name = "平时段服务费单价")
private BigDecimal flatServicePrice;
+ /**
+ * 平金额
+ */
+ @Excel(name = "平金额")
+ private BigDecimal flatAmount;
+
+ /**
+ * 谷单价
+ */
+ @Excel(name = "谷单价")
+ private BigDecimal valleyPrice;
+
/**
* 谷时段用电量
*/
@@ -131,6 +173,12 @@ public class OrderDetail extends BaseEntity {
@Excel(name = "谷时段服务费单价")
private BigDecimal valleyServicePrice;
+ /**
+ * 谷金额
+ */
+ @Excel(name = "谷金额")
+ private BigDecimal valleyAmount;
+
/**
* 删除标识(0-正常;1-删除)
*/
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index a080e84ab..6f1eb5a1f 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -44,18 +44,26 @@
+
+
+
+
+
+
+
+
@@ -105,18 +113,26 @@
total_order_amount,
total_electricity_amount,
total_service_amount,
+ sharp_price,
sharp_used_electricity,
sharp_electricity_price,
sharp_service_price,
+ sharp_amount,
+ peak_price,
peak_used_electricity,
peak_electricity_price,
peak_service_price,
+ peak_amount,
+ flat_price,
flat_used_electricity,
flat_electricity_price,
flat_service_price,
+ flat_amount,
+ valley_price,
valley_used_electricity,
valley_electricity_price,
valley_service_price,
+ valley_amount,
create_by,
create_time,
update_by,
@@ -495,21 +511,20 @@
- insert into order_detail(id, order_code, total_used_electricity, total_order_amount, total_electricity_amount,
- total_service_amount, sharp_used_electricity, sharp_electricity_price,
- sharp_service_price,
- peak_used_electricity, peak_electricity_price, peak_service_price,
- flat_used_electricity, flat_electricity_price,
- flat_service_price, valley_used_electricity, valley_electricity_price,
- valley_service_price, create_by,
- update_by) values
+ insert into order_detail(id, order_code, total_used_electricity, total_order_amount, total_electricity_amount,total_service_amount,
+ sharp_price, sharp_used_electricity, sharp_electricity_price, sharp_service_price, sharp_amount,
+ peak_price, peak_used_electricity, peak_electricity_price, peak_service_price, peak_amount,
+ flat_price, flat_used_electricity, flat_electricity_price, flat_service_price, flat_amount,
+ valley_price, valley_used_electricity, valley_electricity_price, valley_service_price, valley_amount
+ create_by,update_by)
+ values
- (#{item.id}, #{item.orderCode}, #{item.totalUsedElectricity}, #{item.totalOrderAmount},
- #{item.totalElectricityAmount}, #{item.totalServiceAmount}, #{item.sharpUsedElectricity},
- #{item.sharpElectricityPrice}, #{item.sharpServicePrice}, #{item.peakUsedElectricity},
- #{item.peakElectricityPrice}, #{item.peakServicePrice}, #{item.flatUsedElectricity},
- #{item.flatElectricityPrice}, #{item.flatServicePrice}, #{item.valleyUsedElectricity},
- #{item.valleyElectricityPrice}, #{item.valleyServicePrice}, #{item.createBy}, #{item.updateBy})
+ (#{item.id}, #{item.orderCode}, #{item.totalUsedElectricity}, #{item.totalOrderAmount}, #{item.totalElectricityAmount}, #{item.totalServiceAmount},
+ #{item.sharpPrice}, #{item.sharpUsedElectricity}, #{item.sharpElectricityPrice}, #{item.sharpServicePrice}, #{item.sharpAmount},
+ #{item.peakPrice}, #{item.peakUsedElectricity}, #{item.peakElectricityPrice}, #{item.peakServicePrice}, #{item.peakAmount},
+ #{item.flatPrice}, #{item.flatUsedElectricity}, #{item.flatElectricityPrice}, #{item.flatServicePrice}, #{item.flatAmount},
+ #{item.valleyPrice}, #{item.valleyUsedElectricity}, #{item.valleyElectricityPrice}, #{item.valleyServicePrice}, #{item.valleyAmount},
+ #{item.createBy}, #{item.updateBy})
@@ -531,6 +546,9 @@
total_service_amount = #{totalServiceAmount},
+
+ sharp_price = #{sharpPrice},
+
sharp_used_electricity = #{sharpUsedElectricity},
@@ -540,6 +558,12 @@
sharp_service_price = #{sharpServicePrice},
+
+ sharp_amount = #{sharpAmount},
+
+
+ peak_price = #{peakPrice},
+
peak_used_electricity = #{peakUsedElectricity},
@@ -549,6 +573,12 @@
peak_service_price = #{peakServicePrice},
+
+ peak_amount = #{peakAmount},
+
+
+ flat_price = #{flatPrice},
+
flat_used_electricity = #{flatUsedElectricity},
@@ -558,6 +588,12 @@
flat_service_price = #{flatServicePrice},
+
+ flat_amount = #{flatAmount},
+
+
+ valley_price = #{valleyPrice},
+
valley_used_electricity = #{valleyUsedElectricity},
@@ -567,6 +603,9 @@
valley_service_price = #{valleyServicePrice},
+
+ valley_amount = #{valleyAmount},
+
create_by = #{createBy},