Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java

@@ -194,6 +194,30 @@ public class OrderListVO {
     @Excel(name = "服务费")
     private BigDecimal totalServiceAmount;
 
+    /**
+     * 尖时段用电量
+     */
+    @Excel(name = "尖时段用电量")
+    private BigDecimal sharpElectricity;
+
+    /**
+     * 峰时段用电量
+     */
+    @Excel(name = "峰时段用电量")
+    private BigDecimal peakElectricity;
+
+    /**
+     * 平时段用电量
+     */
+    @Excel(name = "平时段用电量")
+    private BigDecimal flatElectricity;
+
+    /**
+     * 谷时段用电量
+     */
+    @Excel(name = "谷时段用电量")
+    private BigDecimal valleyElectricity;
+
     /**
      * 虚拟金额
      */

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -192,6 +192,10 @@
                t4.total_used_electricity   as chargingDegree,
                t4.total_electricity_amount as totalElectricityAmount,
                t4.total_service_amount     as totalServiceAmount,
+                t4.sharp_used_electricity as sharpElectricity,
+                t4.peak_used_electricity as peakElectricity,
+                t4.flat_used_electricity as flatElectricity,
+                t4.valley_used_electricity as valleyElectricity,
                t5.payment_institutions     as paymentInstitutions
         from order_basic_info t1
          left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'