diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityFormulaDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityFormulaDomain.java
index 668a2525..2322b11f 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityFormulaDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityFormulaDomain.java
@@ -31,6 +31,11 @@ public class XhpcActivityFormulaDomain implements Serializable {
      */
     private String endTime;
 
+    /**
+     * 电费
+     */
+    private BigDecimal powerPrice;
+
     /**
      * 服务费
      */
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityInternetDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityInternetDomain.java
index faa1c4fe..7181fa89 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityInternetDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityInternetDomain.java
@@ -38,6 +38,11 @@ public class XhpcActivityInternetDomain implements Serializable {
      */
     private BigDecimal servicePrice;
 
+    /**
+     * 电费
+     */
+    private BigDecimal powerPrice;
+
     /**
      * 计算公式
      */
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityDiscountServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityDiscountServiceImpl.java
index 5d83b6c3..81a63f19 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityDiscountServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityDiscountServiceImpl.java
@@ -6,6 +6,7 @@ import com.xhpc.activity.mapper.XhpcActivityDiscountMapper;
 import com.xhpc.activity.mapper.XhpcActivityTemplateMapper;
 import com.xhpc.activity.service.XhpcActivityDiscountService;
 import com.xhpc.common.core.exception.CustomException;
+import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.common.core.web.service.BaseService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -89,17 +90,17 @@ public class XhpcActivityDiscountServiceImpl extends BaseService implements Xhpc
 
 
         String appUserIds = "";
-        if(discountDomain.getAppUserList() != null){
+        if(StringUtils.isNotEmpty(discountDomain.getAppUserList())){
             appUserIds = discountDomain.getAppUserList();
         }
 
         String comUserIds = "";
-        if(discountDomain.getComUserList() != null){
+        if(StringUtils.isNotEmpty(discountDomain.getComUserList())){
             comUserIds = discountDomain.getComUserList();
         }
 
         String bUserIds = "";
-        if(discountDomain.getCusUserList() != null){
+        if(StringUtils.isNotEmpty(discountDomain.getCusUserList())){
             bUserIds = discountDomain.getCusUserList();
         }
 
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml
index e813ad91..b95eea16 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml
@@ -6,6 +6,7 @@
         <result column="activity_id" jdbcType="INTEGER" property="activityId"/>
         <result column="start_time" property="startTime"/>
         <result column="end_time" property="endTime"/>
+        <result column="power_price" javaType="DECIMAL" property="powerPrice"/>
         <result column="service_price" javaType="DECIMAL" property="servicePrice"/>
         <result column="compute_formula" jdbcType="VARCHAR" property="computeFormula"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
@@ -15,7 +16,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         activity_formula_id
-        , activity_id, start_time, end_time, service_price, compute_formula, create_time,
+        , activity_id, start_time, end_time, power_price, service_price, compute_formula, create_time,
     create_by, update_time, update_by
     </sql>
 
@@ -52,21 +53,21 @@
 
     <insert id="insert" keyColumn="activity_formula_id" keyProperty="activityFormulaId"
             parameterType="com.xhpc.activity.domain.XhpcActivityFormulaDomain" useGeneratedKeys="true">
-        insert into xhpc_activity_formula (activity_id, start_time, end_time,
+        insert into xhpc_activity_formula (activity_id, start_time, end_time, power_price,
                                            service_price, compute_formula, create_time, create_by,
                                            update_time, update_by)
-        values (#{activityId,jdbcType=INTEGER}, #{startTime}, #{endTime},
+        values (#{activityId,jdbcType=INTEGER}, #{startTime}, #{endTime}, #{powerPrice},
                 #{servicePrice}, #{computeFormula,jdbcType=VARCHAR}, sysdate(), #{createBy,jdbcType=VARCHAR},
                 sysdate(), #{updateBy,jdbcType=VARCHAR})
     </insert>
 
 
     <insert id="insertBatch">
-        insert into xhpc_activity_formula (activity_id, start_time, end_time,
+        insert into xhpc_activity_formula (activity_id, start_time, end_time, power_price,
         service_price, compute_formula, create_time, create_by,
         update_time, update_by) values
         <foreach collection="domainList" separator="," item="domain" index="index">
-            (#{domain.activityId}, #{domain.startTime}, #{domain.endTime},
+            (#{domain.activityId}, #{domain.startTime}, #{domain.endTime},#{domain.powerPrice},
             #{domain.servicePrice}, #{domain.computeFormula}, sysdate(), #{domain.createBy},
             sysdate(), #{domain.updateBy})
         </foreach>
@@ -78,6 +79,7 @@
         set activity_id     = #{activityId,jdbcType=INTEGER},
             start_time      = #{startTime},
             end_time        = #{endTime},
+            power_price   = #{powerPrice},
             service_price   = #{servicePrice},
             compute_formula = #{computeFormula,jdbcType=VARCHAR},
             update_time     = sysdate(),
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml
index acdaccc6..0aa9dabd 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml
@@ -6,6 +6,7 @@
         <result column="activity_name" jdbcType="VARCHAR" property="activityName"/>
         <result column="internet_name" jdbcType="VARCHAR" property="internetName"/>
         <result column="compute_type" jdbcType="SMALLINT" property="computeType"/>
+        <result column="power_price" javaType="DECIMAL" property="powerPrice"/>
         <result column="service_price" javaType="DECIMAL" property="servicePrice"/>
         <result column="compute_formula" jdbcType="VARCHAR" property="computeFormula"/>
         <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
@@ -23,7 +24,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         activity_id
-        , activity_name, internet_name, compute_type, service_price, compute_formula, start_time,
+        , activity_name, internet_name, compute_type, power_price, service_price, compute_formula, start_time,
     end_time, station_list, tenant_id, `status`, del_flag, create_by, create_time, update_by, 
     update_time, check_by, check_time
     </sql>
@@ -91,12 +92,12 @@
 
     <insert id="insert" keyColumn="activity_id" keyProperty="activityId"
             parameterType="com.xhpc.activity.domain.XhpcActivityInternetDomain" useGeneratedKeys="true">
-        insert into xhpc_activity_internet (activity_name, internet_name, compute_type,
+        insert into xhpc_activity_internet (activity_name, internet_name, compute_type, power_price,
                                             service_price, compute_formula, start_time, end_time,
                                             station_list, tenant_id, `status`,
                                             del_flag, create_by, create_time,
                                             update_by, update_time, check_by, check_time)
-        values (#{activityName,jdbcType=VARCHAR}, #{internetName,jdbcType=VARCHAR}, #{computeType,jdbcType=SMALLINT},
+        values (#{activityName,jdbcType=VARCHAR}, #{internetName,jdbcType=VARCHAR}, #{computeType,jdbcType=SMALLINT}, #{powerPrice},
                 #{servicePrice}, #{computeFormula,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP},
                 #{endTime,jdbcType=TIMESTAMP},
                 #{stationList,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT},
@@ -110,6 +111,7 @@
         set activity_name   = #{activityName,jdbcType=VARCHAR},
             internet_name   = #{internetName,jdbcType=VARCHAR},
             compute_type    = #{computeType,jdbcType=SMALLINT},
+            power_price   = #{powerPrice},
             service_price   = #{servicePrice},
             compute_formula = #{computeFormula,jdbcType=VARCHAR},
             start_time      = #{startTime,jdbcType=TIMESTAMP},