Merge branch 'dev_mess_party' of http://121.42.41.42:7070/r/epmet-cloud into dev_mess_party

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<SysSmsDao, SysSmsEntity>
             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<SysSmsDao, SysSmsEntity>
         }catch (RenException e){
             logger.error(e.getInternalMsg());
         }
-        Map<Boolean, List<CrmParameterResultDTO>> groupByStatus = parameterResult.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getBalanceStatus));
+        Map<Boolean, List<CrmParameterResultDTO>> groupBySwitch = parameterResult.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getSwitchStatus));
+        List<CrmParameterResultDTO> crmParameterTrue = groupBySwitch.get(true);
+        Map<Boolean, List<CrmParameterResultDTO>> groupByStatus = crmParameterTrue.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getBalanceStatus));
         List<CrmParameterResultDTO> 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);
+        }
     }
 
     /**