增加活动折扣金额展示字段

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingHistoryOrderDomain.java

@@ -61,6 +61,21 @@ public class XhpcClearingHistoryOrderDomain implements Serializable {
      */
     private BigDecimal totalPrice;
 
+    /**
+     * 活动总电费
+     */
+    private BigDecimal activityPowerPriceTotal;
+
+    /**
+     * 活动总服务费
+     */
+    private BigDecimal activityServicePriceTotal;
+
+    /**
+     * 活动总金额
+     */
+    private BigDecimal activityTotalPrice;
+
     /**
      * 电站活动抵扣--抵扣的总金额
      */

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java

@@ -67,6 +67,21 @@ public class XhpcHistoryOrderDomain implements Serializable {
      */
     private BigDecimal totalPrice;
 
+    /**
+     * 活动总电费
+     */
+    private BigDecimal activityPowerPriceTotal;
+
+    /**
+     * 活动总服务费
+     */
+    private BigDecimal activityServicePriceTotal;
+
+    /**
+     * 活动总金额
+     */
+    private BigDecimal activityTotalPrice;
+
     /**
      * 电站活动抵扣--抵扣的总金额
      */

xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml

@@ -12,6 +12,9 @@
         <result column="power_price_total" jdbcType="DECIMAL" property="powerPriceTotal"/>
         <result column="service_price_total" jdbcType="DECIMAL" property="servicePriceTotal"/>
         <result column="total_price" jdbcType="DECIMAL" property="totalPrice"/>
+        <result column="activity_power_price_total" jdbcType="DECIMAL" property="activityPowerPriceTotal"/>
+        <result column="activity_service_price_total" jdbcType="DECIMAL" property="activityServicePriceTotal"/>
+        <result column="activity_total_price" jdbcType="DECIMAL" property="activityTotalPrice"/>
         <result column="promotion_discount" jdbcType="DECIMAL" property="promotionDiscount"/>
         <result column="act_price" jdbcType="DECIMAL" property="actPrice"/>
         <result column="act_power_price" jdbcType="DECIMAL" property="actPowerPrice"/>
@@ -74,7 +77,8 @@
     ho.meter_value_start_evcs, ho.operator_id3rdpty_evcs, ho.start_time, ho.end_time, ho.stop_reason_evcs,
     ho.total_power, ho.user_name_evcs, ho.phone, ho.evcs_order_no, ho.confirm_Result, ho.rate_model_id,
     ho.charging_mode, ho.internet_degree_commission, ho.`source`, ho.tenant_id, ho.operator_id, ho.operator_name,
-    ho.clearing_checkout_id, ho.check_status, ho.check_by, ho.check_time
+    ho.clearing_checkout_id, ho.check_status, ho.check_by, ho.check_time, ho.activity_power_price_total,
+    ho.activity_service_price_total, ho.activity_total_price
     </sql>
 
 
@@ -266,6 +270,8 @@
         sorting_status, `type`, `status`,
         del_flag, create_time, create_by,
         update_time, update_by, remark,
+        activity_power_price_total,
+        activity_service_price_total, activity_total_price,
         `state`, vin_normal, search_value,
         operator_id_evcs, charge_model_evcs, connector_power_evcs,
         meter_value_end_evcs, meter_value_start_evcs, operator_id3rdpty_evcs,
@@ -297,6 +303,7 @@
             #{domain.createBy},
             #{domain.updateTime}, #{domain.updateBy},
             #{domain.remark},
+             #{domain.activityPowerPriceTotal}, #{domain.activityServicePriceTotal}, #{domain.activityTotalPrice},
             #{domain.state}, #{domain.vinNormal},
             #{domain.searchValue},
             #{domain.operatorIdEvcs}, #{domain.chargeModelEvcs},
@@ -330,6 +337,8 @@
                                                  sorting_status, `type`, `status`,
                                                  del_flag, create_time, create_by,
                                                  update_time, update_by, remark,
+                                                 activity_power_price_total,
+                                                 activity_service_price_total, activity_total_price,
                                                  `state`, vin_normal, search_value,
                                                  operator_id_evcs, charge_model_evcs, connector_power_evcs,
                                                  meter_value_end_evcs, meter_value_start_evcs, operator_id3rdpty_evcs,
@@ -353,6 +362,7 @@
                 #{sortingStatus}, #{type}, #{status},
                 #{delFlag}, #{createTime}, #{createBy},
                 #{updateTime}, #{updateBy}, #{remark},
+                #{activityPowerPriceTotal}, #{activityServicePriceTotal}, #{activityTotalPrice},
                 #{state}, #{vinNormal}, #{searchValue},
                 #{operatorIdEvcs}, #{chargeModelEvcs},
                 #{connectorPowerEvcs},
@@ -378,6 +388,9 @@
             power_price_total          = #{powerPriceTotal},
             service_price_total        = #{servicePriceTotal},
             total_price                = #{totalPrice},
+            activity_power_price_total=#{activityPowerPriceTotal},
+            activity_service_price_total=#{activityServicePriceTotal},
+            activity_total_price = #{activityTotalPrice},
             promotion_discount         = #{promotionDiscount},
             act_price                  = #{actPrice},
             act_power_price            = #{actPowerPrice},

xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml

@@ -15,6 +15,9 @@
         <result column="power_price_total" jdbcType="DECIMAL" property="powerPriceTotal" />
         <result column="service_price_total" jdbcType="DECIMAL" property="servicePriceTotal" />
         <result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
+        <result column="activity_power_price_total" jdbcType="DECIMAL" property="activityPowerPriceTotal"/>
+        <result column="activity_service_price_total" jdbcType="DECIMAL" property="activityServicePriceTotal"/>
+        <result column="activity_total_price" jdbcType="DECIMAL" property="activityTotalPrice"/>
         <result column="promotion_discount" jdbcType="DECIMAL" property="promotionDiscount" />
         <result column="act_price" jdbcType="DECIMAL" property="actPrice" />
         <result column="act_power_price" jdbcType="DECIMAL" property="actPowerPrice" />
@@ -70,7 +73,8 @@
     ho.operator_id_evcs, ho.charge_model_evcs, ho.connector_power_evcs, ho.meter_value_end_evcs,
     ho.meter_value_start_evcs, ho.operator_id3rdpty_evcs, ho.start_time, ho.end_time, ho.stop_reason_evcs,
     ho.total_power, ho.user_name_evcs, ho.phone, ho.evcs_order_no, ho.confirm_Result, ho.rate_model_id,
-    ho.charging_mode, ho.internet_degree_commission, ho.`source`, ho.tenant_id
+    ho.charging_mode, ho.internet_degree_commission, ho.`source`, ho.tenant_id, ho.activity_power_price_total,
+    ho.activity_service_price_total, ho.activity_total_price
     </sql>