From db9439ab985df2e9d0ed23fa933c4f21c3e8e036 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 6 Jan 2021 09:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/SysSmsConstant.java | 2 ++ .../epmet/service/impl/SysSmsServiceImpl.java | 22 +++++++++++-------- .../com/epmet/dto/CustomerParameterDTO.java | 5 +++++ .../dto/result/CrmParameterResultDTO.java | 5 +++++ .../epmet/entity/CustomerParameterEntity.java | 7 +++++- .../resources/mapper/CustomerParameterDao.xml | 3 ++- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SysSmsConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SysSmsConstant.java index c0655993f7..32be48a287 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SysSmsConstant.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SysSmsConstant.java @@ -14,4 +14,6 @@ public interface SysSmsConstant { String NOT_ENOUGH_BALANCE = "客户：%s ，当前余额为：%s"; + String NOT_ON_SWITCH = "客户：%s ，【%s】开关未开启"; + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index 90c29bcf34..185b9cbd7a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java @@ -228,16 +228,20 @@ public class SysSmsServiceImpl extends BaseServiceImpl groupByCustomer.forEach((customerId,v) -> { parameterResult.forEach(p -> { if (customerId.equals(p.getCustomerId())){ - if (p.getBalanceStatus() == false){ - logger.error(String.format(SysSmsConstant.NOT_ENOUGH_BALANCE,customerId,p.getParameterValue())); + if (p.getSwitchStatus() == false){ + logger.error(String.format(SysSmsConstant.NOT_ON_SWITCH,customerId,p.getParameterKey())); }else { - v.forEach(dto->{ - SysSmsDTO sysSmsDTO = new SysSmsDTO(); - sysSmsDTO.setMobile(dto.getMobile()); - sysSmsDTO.setAliyunTemplateCode(dto.getAliyunTemplateCode()); - //推送短信 - this.sendMsg(sysSmsDTO); - }); + if (p.getBalanceStatus() == false){ + logger.error(String.format(SysSmsConstant.NOT_ENOUGH_BALANCE,customerId,p.getParameterValue())); + }else { + v.forEach(dto->{ + SysSmsDTO sysSmsDTO = new SysSmsDTO(); + sysSmsDTO.setMobile(dto.getMobile()); + sysSmsDTO.setAliyunTemplateCode(dto.getAliyunTemplateCode()); + //推送短信 + this.sendMsg(sysSmsDTO); + }); + } } } }); diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerParameterDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerParameterDTO.java index cd5f22e098..187553f93a 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerParameterDTO.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerParameterDTO.java @@ -39,6 +39,11 @@ public class CustomerParameterDTO implements Serializable { */ private String parameterValue; + /** + * 参数开关：开启：on，关闭：off + */ + private String parameterSwitch; + /** * 说明 */ diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CrmParameterResultDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CrmParameterResultDTO.java index c18bf9ee3b..23cca7c0d9 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CrmParameterResultDTO.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CrmParameterResultDTO.java @@ -41,4 +41,9 @@ public class CrmParameterResultDTO implements Serializable { * 新的参数VALUE值 */ private String subtractParameterValue; + + /** + * 参数开关状态 true：开启，false：关闭 + */ + private Boolean switchStatus; } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerParameterEntity.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerParameterEntity.java index a99c99573b..9ed4ae997a 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerParameterEntity.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerParameterEntity.java @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("customer_project_parameter") +@TableName("customer_parameter") public class CustomerParameterEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; @@ -36,6 +36,11 @@ public class CustomerParameterEntity extends BaseEpmetEntity { */ private String parameterValue; + /** + * 参数开关：开启：on，关闭：off + */ + private String parameterSwitch; + /** * 说明 */ diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerParameterDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerParameterDao.xml index 3c25c2e33a..2a5c38a13d 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerParameterDao.xml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerParameterDao.xml @@ -20,7 +20,8 @@ SELECT CUSTOMER_ID, PARAMETER_KEY, - PARAMETER_VALUE + PARAMETER_VALUE, + (CASE WHEN PARAMETER_SWITCH = 'on' THEN TRUE ELSE FALSE END) AS switchStatus FROM customer_parameter WHERE DEL_FLAG = 0 AND