From 4d9e81a2df57b8d680348672db05f833a5f11b51 Mon Sep 17 00:00:00 2001
From: "DESKTOP-D9QDT1P\\JS-ZZA" <ziao4956@gmail.com>
Date: Wed, 8 Mar 2023 11:02:57 +0800
Subject: [PATCH] =?UTF-8?q?order=5Fdetail=E8=A1=A8=E4=B8=AD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20=E5=90=84=E6=97=B6=E6=AE=B5=E5=8D=95=E4=BB=B7?=
 =?UTF-8?q?=E5=92=8C=E6=80=BB=E9=87=91=E9=A2=9D=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=88=E5=85=B18=E4=B8=AA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/domain/OrderDetail.java  | 48 +++++++++++++
 .../mapper/pile/OrderBasicInfoMapper.xml      | 67 +++++++++++++++----
 2 files changed, 101 insertions(+), 14 deletions(-)

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 @@
         <result property="totalOrderAmount" column="total_order_amount"/>
         <result property="totalElectricityAmount" column="total_electricity_amount"/>
         <result property="totalServiceAmount" column="total_service_amount"/>
+        <result property="sharpPrice" column="sharp_price"/>
         <result property="sharpUsedElectricity" column="sharp_used_electricity"/>
         <result property="sharpElectricityPrice" column="sharp_electricity_price"/>
         <result property="sharpServicePrice" column="sharp_service_price"/>
+        <result property="sharpAmount" column="sharp_amount"/>
+        <result property="peakPrice" column="peak_price"/>
         <result property="peakUsedElectricity" column="peak_used_electricity"/>
         <result property="peakElectricityPrice" column="peak_electricity_price"/>
         <result property="peakServicePrice" column="peak_service_price"/>
+        <result property="peakAmount" column="peak_amount"/>
+        <result property="flatPrice" column="flat_price"/>
         <result property="flatUsedElectricity" column="flat_used_electricity"/>
         <result property="flatElectricityPrice" column="flat_electricity_price"/>
         <result property="flatServicePrice" column="flat_service_price"/>
+        <result property="flatAmount" column="flat_amount"/>
+        <result property="valleyPrice" column="valley_price"/>
         <result property="valleyUsedElectricity" column="valley_used_electricity"/>
         <result property="valleyElectricityPrice" column="valley_electricity_price"/>
         <result property="valleyServicePrice" column="valley_service_price"/>
+        <result property="valleyAmount" column="valley_amount"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -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 @@
     </delete>
 
     <insert id="batchOrderDetail">
-        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
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{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})
         </foreach>
     </insert>
 
@@ -531,6 +546,9 @@
             <if test="totalServiceAmount != null">
                 total_service_amount = #{totalServiceAmount},
             </if>
+            <if test="sharpPrice != null">
+                sharp_price = #{sharpPrice},
+            </if>
             <if test="sharpUsedElectricity != null">
                 sharp_used_electricity = #{sharpUsedElectricity},
             </if>
@@ -540,6 +558,12 @@
             <if test="sharpServicePrice != null">
                 sharp_service_price = #{sharpServicePrice},
             </if>
+            <if test="sharpAmount != null">
+                sharp_amount = #{sharpAmount},
+            </if>
+            <if test="peakPrice != null">
+                peak_price = #{peakPrice},
+            </if>
             <if test="peakUsedElectricity != null">
                 peak_used_electricity = #{peakUsedElectricity},
             </if>
@@ -549,6 +573,12 @@
             <if test="peakServicePrice != null">
                 peak_service_price = #{peakServicePrice},
             </if>
+            <if test="peakAmount != null">
+                peak_amount = #{peakAmount},
+            </if>
+            <if test="flatPrice != null">
+                flat_price = #{flatPrice},
+            </if>
             <if test="flatUsedElectricity != null">
                 flat_used_electricity = #{flatUsedElectricity},
             </if>
@@ -558,6 +588,12 @@
             <if test="flatServicePrice != null">
                 flat_service_price = #{flatServicePrice},
             </if>
+            <if test="flatAmount != null">
+                flat_amount = #{flatAmount},
+            </if>
+            <if test="valleyPrice != null">
+                valley_price = #{valleyPrice},
+            </if>
             <if test="valleyUsedElectricity != null">
                 valley_used_electricity = #{valleyUsedElectricity},
             </if>
@@ -567,6 +603,9 @@
             <if test="valleyServicePrice != null">
                 valley_service_price = #{valleyServicePrice},
             </if>
+            <if test="valleyAmount != null">
+                valley_amount = #{valleyAmount},
+            </if>
             <if test="createBy != null">
                 create_by = #{createBy},
             </if>