From 046e4a18265c255dd4850bb4f2f9e747c728ba57 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 13 Apr 2022 11:50:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=96=B9=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B5=E9=87=8F=E5=8D=95=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/domain/XhpcActivityFormulaDomain.java | 5 +++++ .../activity/domain/XhpcActivityInternetDomain.java | 5 +++++ .../impl/XhpcActivityDiscountServiceImpl.java | 7 ++++--- .../resources/mapper/XhpcActivityFormulaMapper.xml | 12 +++++++----- .../resources/mapper/XhpcActivityInternetMapper.xml | 8 +++++--- 5 files changed, 26 insertions(+), 11 deletions(-) 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 @@ + @@ -15,7 +16,7 @@ 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 @@ -52,21 +53,21 @@ - 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 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 - (#{domain.activityId}, #{domain.startTime}, #{domain.endTime}, + (#{domain.activityId}, #{domain.startTime}, #{domain.endTime},#{domain.powerPrice}, #{domain.servicePrice}, #{domain.computeFormula}, sysdate(), #{domain.createBy}, sysdate(), #{domain.updateBy}) @@ -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 @@ + @@ -23,7 +24,7 @@ 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 @@ -91,12 +92,12 @@ - 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},