From cdddc6b51f9bb5837e7788cfcce3b30ea51c398b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 6 Jan 2021 10:43: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 --- .../epmet/service/impl/SysSmsServiceImpl.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) 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 185b9cbd7a..f5c741a212 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,9 +228,11 @@ public class SysSmsServiceImpl extends BaseServiceImpl groupByCustomer.forEach((customerId,v) -> { parameterResult.forEach(p -> { if (customerId.equals(p.getCustomerId())){ + // 判断参数开关是否打开，false：未打开 if (p.getSwitchStatus() == false){ logger.error(String.format(SysSmsConstant.NOT_ON_SWITCH,customerId,p.getParameterKey())); }else { + // 判断余额状态 false：余额不足 if (p.getBalanceStatus() == false){ logger.error(String.format(SysSmsConstant.NOT_ENOUGH_BALANCE,customerId,p.getParameterValue())); }else { @@ -249,17 +251,14 @@ public class SysSmsServiceImpl extends BaseServiceImpl }catch (RenException e){ logger.error(e.getInternalMsg()); } - Map> groupByStatus = parameterResult.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getBalanceStatus)); + Map> groupBySwitch = parameterResult.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getSwitchStatus)); + List crmParameterTrue = groupBySwitch.get(true); + Map> groupByStatus = crmParameterTrue.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getBalanceStatus)); List crmParameterResultDTOS = groupByStatus.get(true); - operCrmOpenFeignClient.updateParamInfo(crmParameterResultDTOS); - -// formDTOList.forEach(dto->{ -// SysSmsDTO sysSmsDTO = new SysSmsDTO(); -// sysSmsDTO.setMobile(dto.getMobile()); -// sysSmsDTO.setAliyunTemplateCode(dto.getAliyunTemplateCode()); -// //推送短信 -// this.sendMsg(sysSmsDTO); -// }); + // 把参数开关打开的，已发送短信的客户更新余额 + if (!CollectionUtils.isEmpty(crmParameterResultDTOS)){ + operCrmOpenFeignClient.updateParamInfo(crmParameterResultDTOS); + } } /**