新增优惠信息、设备使用率字段

entity/src/main/java/com/kym/entity/admin/StationStatDay.java

@@ -2,8 +2,6 @@ package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDate;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -64,6 +62,16 @@ public class StationStatDay extends BaseEntity {
      */
     private Integer serviceMoney;
 
+    /**
+     * 服务费优惠金额
+     */
+    private Integer serviceMoneyDiscount;
+
+    /**
+     * 总优惠金额
+     */
+    private Integer discountAmount;
+
     /**
      * 订单平均充电量
      */
@@ -78,4 +86,9 @@ public class StationStatDay extends BaseEntity {
      * 单枪平均日充电量
      */
     private Double avgConnectorElec;
+
+    /**
+     * 设备使用率
+     */
+    private Double connectorUsageRate;
 }

entity/src/main/java/com/kym/entity/admin/StationStatMonth.java

@@ -64,6 +64,16 @@ public class StationStatMonth extends BaseEntity {
      */
     private Integer serviceMoney;
 
+    /**
+     * 服务费优惠金额
+     */
+    private Integer serviceMoneyDiscount;
+
+    /**
+     * 总优惠金额
+     */
+    private Integer discountAmount;
+
     /**
      * 订单平均充电量
      */
@@ -78,4 +88,9 @@ public class StationStatMonth extends BaseEntity {
      * 单枪平均日充电量
      */
     private Double avgConnectorElec;
+
+    /**
+     * 设备使用率
+     */
+    private Double connectorUsageRate;
 }

mapper/src/main/resources/mappers/admin/StationStatDayMapper.xml

@@ -13,16 +13,19 @@
         <result column="total_money" property="totalMoney" />
         <result column="elec_money" property="elecMoney" />
         <result column="service_money" property="serviceMoney" />
+        <result column="service_money_discount" property="serviceMoneyDiscount" />
+        <result column="discount_amount" property="discountAmount" />
         <result column="avg_order_elec" property="avgOrderElec" />
         <result column="avg_order_money" property="avgOrderMoney" />
         <result column="avg_connector_elec" property="avgConnectorElec" />
+        <result column="connector_usage_rate" property="connectorUsageRate" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,station_id, stat_day, charge_users, valid_orders, total_power, total_money, elec_money, service_money, avg_order_elec, avg_order_money, avg_connector_elec,create_time, update_time
+        id,station_id, stat_day, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,create_time, update_time
     </sql>
 
 </mapper>

mapper/src/main/resources/mappers/admin/StationStatMonthMapper.xml

@@ -13,16 +13,19 @@
         <result column="total_money" property="totalMoney" />
         <result column="elec_money" property="elecMoney" />
         <result column="service_money" property="serviceMoney" />
+        <result column="service_money_discount" property="serviceMoneyDiscount" />
+        <result column="discount_amount" property="discountAmount" />
         <result column="avg_order_elec" property="avgOrderElec" />
         <result column="avg_order_money" property="avgOrderMoney" />
         <result column="avg_connector_elec" property="avgConnectorElec" />
+        <result column="connector_usage_rate" property="connectorUsageRate" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,station_id, stat_month, charge_users, valid_orders, total_power, total_money, elec_money, service_money, avg_order_elec, avg_order_money, avg_connector_elec,create_time, update_time
+        id,station_id, stat_month, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,create_time, update_time
     </sql>
 
 </mapper>