diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java index e2f5c8bb..fb35ee3a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java @@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils; */ public enum CompanyMessageEnums { - MSG1("QY_1_HYTZ_WORK_GROUP_CREATE","会议通知","meetingName"),//点击跳转到报名页面，meetingName + MSG1("QY_1_HYTZ_WORK_GROUP_CREATE","会议通知","meetingName,busId"),//点击跳转到报名页面，meetingName,busId MSG2("QY_2_HYTZ_WORK_GROUP_SIGN_UP","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName MSG3("QY_3_HYTZ_WORK_GROUP_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName MSG4("QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 8e5726a6..1f1964bd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -194,7 +194,7 @@ public class SendMessageServiceImpl implements SendMessageService { } }catch (Exception e){ log.error("发送消息异常",e); - // throw new JeroBootException("消息发送失败！"); + throw new JeroBootException("消息发送失败！"); } } // todo 发送短信 待完成 @@ -202,6 +202,28 @@ public class SendMessageServiceImpl implements SendMessageService { if(StringUtils.isEmpty(sendMessageDTO.getPhone())){ throw new JeroBootException("发送短信，手机号不能为空！"); } + if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ + // 短信去掉系统url替换与小程序名称替换 + if(map.containsKey("systemAddress")){ + map.remove("systemAddress"); + } + if(map.containsKey("wxName")){ + map.remove("wxName"); + } + + } + // 会议通知 去掉 工作组xxx（会议名称）报名已开始，点击报名>>超链接中的busId + if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())){ + if(map.containsKey("busId")){ + map.remove("busId"); + } + } + try { String sender = ""; String signature = ""; @@ -276,19 +298,19 @@ public class SendMessageServiceImpl implements SendMessageService { //中汽中心标准所-企业端-会议通知-2 sender = "8821092414406"; signature = "中汽中心标准所"; - templateId = ""; //todo 审核不通过 + templateId = "7bb409f0bacf476390b5c8298df53e4b"; //todo 审核不通过 break; case "QY_3_HYTZ_WORK_GROUP_UPLOAD": //中汽中心标准所-企业端-会议通知-3 sender = "8821092414406"; signature = "中汽中心标准所"; - templateId = "";//todo 审核不通过 + templateId = "b7742cdb2c524f3d8d08deb3d32f2d57";//todo 审核不通过 break; case "QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD": //中汽中心标准所-企业端-会议通知-4 sender = "8821092414406"; signature = "中汽中心标准所"; - templateId = "";//todo 审核不通过 + templateId = "4829c9fae6df47c881475672e186a497";//todo 审核不通过 //通知类短信，不需要存redis break; case "QY_5_HYTZ_NOT_AUDIT": @@ -301,13 +323,13 @@ public class SendMessageServiceImpl implements SendMessageService { //中汽中心标准所-企业端-会议通知-6 sender = "8821092414406"; signature = "中汽中心标准所"; - templateId = "";//todo 审核不通过 + templateId = "88e6b8880be640c8b7c91b9dbe0a7a85";//todo 审核不通过 break; case "QY_7_WJTZ_MEETING_SEND": //中汽中心标准所-企业端-文件通知-7 sender = "8821092414406"; signature = "中汽中心标准所"; - templateId = "";//todo 审核不通过 + templateId = "2238fbb4e3fd4ff68bb47e872e7c9a05";//todo 审核不通过 //通知类短信，不需要存redis break; case "QY_8_HTTZ_PHASE": @@ -339,7 +361,7 @@ public class SendMessageServiceImpl implements SendMessageService { //中汽中心标准所-企业端-文件通知-12 sender = "8821092414406"; signature = "中汽中心标准所"; - templateId = "";//todo 审核不通过 + templateId = "e1a089109aaa4820927d488613171b54";//todo 审核不通过 break; default: throw new JeroBootException("codeType flase."); @@ -360,9 +382,11 @@ public class SendMessageServiceImpl implements SendMessageService { sb.append("["); String[] s = str.split(","); for (int i = 0; i < s.length; i++) { - sb.append("\"" + map.get(s[i]) + "\""); - if(i < (s.length - 1)){ - sb.append(","); + if(map.containsKey(s[i])){ + sb.append("\"" + map.get(s[i]) + "\""); + if(i < (s.length - 1)){ + sb.append(","); + } } } sb.append("]"); @@ -371,7 +395,7 @@ public class SendMessageServiceImpl implements SendMessageService { sysBaseAPI.sendMessage(sendMessageDTO.getPhone(),sender,templateId,signature,templateParas); }catch (Exception e){ log.error("发送短信异常",e); - // throw new JeroBootException("短信发送失败！"); + throw new JeroBootException("短信发送失败！"); } } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 4187d6f4..4d47221f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -244,7 +244,7 @@ public class PayCompanyManagementController extends JeroController list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY)); + List list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); if(!CollectionUtils.isEmpty(list)){ list.forEach(item->{ // 发送消息 @@ -333,7 +333,7 @@ public class PayCompanyManagementController extends JeroController list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY)); + List list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); if(!CollectionUtils.isEmpty(list)){ list.forEach(item->{ // 发送消息