From 82e1f4a1c85cc2910caddc3a1261a9a5cd6800bf Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 8 Jan 2025 09:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=96=B0=E5=A2=9E=E6=B1=87=E6=80=BB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OrderBasicInfoServiceImpl.java       |  4 ++++
 .../jsowell/pile/vo/web/IndexOrderInfoVO.java | 20 +++++++++++++++++++
 .../mapper/pile/OrderBasicInfoMapper.xml      |  6 +++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 4445bca39..092ffef69 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -2492,9 +2492,13 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
                 vo.setTotalElectricity(totalElectricity.toString());
                 if (detailInfo != null) {
                     vo.setTotalPeakUsedElectricity(detailInfo.getTotalPeakUsedElectricity());
+                    vo.setTotalSharpAmount(detailInfo.getTotalSharpAmount());
                     vo.setTotalFlatUsedElectricity(detailInfo.getTotalFlatUsedElectricity());
+                    vo.setTotalPeakAmount(detailInfo.getTotalPeakAmount());
                     vo.setTotalSharpUsedElectricity(detailInfo.getTotalSharpUsedElectricity());
+                    vo.setTotalFlatAmount(detailInfo.getTotalFlatAmount());
                     vo.setTotalValleyUsedElectricity(detailInfo.getTotalValleyUsedElectricity());
+                    vo.setTotalValleyAmount(detailInfo.getTotalValleyAmount());
                 }
                 resultList.add(vo);
             }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java
index f5127e9ce..ab5a7033c 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java
@@ -35,19 +35,39 @@ public class IndexOrderInfoVO {
      */
     private String totalSharpUsedElectricity;
 
+    /**
+     * 尖时段总金额
+     */
+    private String totalSharpAmount;
+
     /**
      * 峰时段总用电量
      */
     private String totalPeakUsedElectricity;
 
+    /**
+     * 峰时段总金额
+     */
+    private String totalPeakAmount;
+
     /**
      * 平时段总用电量
      */
     private String totalFlatUsedElectricity;
 
+    /**
+     * 平时段总金额
+     */
+    private String totalFlatAmount;
+
     /**
      * 谷时段总用电量
      */
     private String totalValleyUsedElectricity;
 
+    /**
+     * 谷时段总金额
+     */
+    private String totalValleyAmount;
+
 }
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 53e4cfc8c..fd358de4a 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -2802,9 +2802,13 @@
     <select id="getIndexOrderDetail" resultType="com.jsowell.pile.vo.web.IndexOrderInfoVO">
         select
         sum(sharp_used_electricity) AS totalSharpUsedElectricity,
+        sum(sharp_amount) as totalSharpAmount,
         sum(peak_used_electricity) AS totalPeakUsedElectricity,
+        sum(peak_amount) as totalPeakAmount,
         sum(flat_used_electricity) AS totalFlatUsedElectricity,
-        sum(valley_used_electricity) AS totalValleyUsedElectricity
+        sum(flat_amount) as totalFlatAmount,
+        sum(valley_used_electricity) AS totalValleyUsedElectricity,
+        sum(valley_amount) as totalValleyAmount
         from order_detail
         <if test="list != null and list.size() != 0">
             where order_code in