LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改短信模板，修改新增企业消息接收人为财务人员

Browse Source
This commit is contained in:
梁琦涛
2021-10-21 15:54:03 +08:00
parent 4b61bce2ca
commit e429853f64
3 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
*/ */
public enum CompanyMessageEnums { 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 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 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 MSG4("QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD","会议通知","meetingName,systemAddress,wxName"),//弹窗：查看该会议详情，meetingName，systemUrl，wxName
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+35 -11
View File
@@ -194,7 +194,7 @@ public class SendMessageServiceImpl implements SendMessageService {
} }
}catch (Exception e){ }catch (Exception e){
log.error("发送消息异常",e); log.error("发送消息异常",e);
// throw new JeroBootException("消息发送失败！"); throw new JeroBootException("消息发送失败！");
} }
} }
// todo 发送短信 待完成 // todo 发送短信 待完成
@@ -202,6 +202,28 @@ public class SendMessageServiceImpl implements SendMessageService {
if(StringUtils.isEmpty(sendMessageDTO.getPhone())){ if(StringUtils.isEmpty(sendMessageDTO.getPhone())){
throw new JeroBootException("发送短信，手机号不能为空！"); 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 { try {
String sender = ""; String sender = "";
String signature = ""; String signature = "";
@@ -276,19 +298,19 @@ public class SendMessageServiceImpl implements SendMessageService {
//中汽中心标准所-企业端-会议通知-2 //中汽中心标准所-企业端-会议通知-2
sender = "8821092414406"; sender = "8821092414406";
signature = "中汽中心标准所"; signature = "中汽中心标准所";
templateId = ""; //todo 审核不通过 templateId = "7bb409f0bacf476390b5c8298df53e4b"; //todo 审核不通过
break; break;
case "QY_3_HYTZ_WORK_GROUP_UPLOAD": case "QY_3_HYTZ_WORK_GROUP_UPLOAD":
//中汽中心标准所-企业端-会议通知-3 //中汽中心标准所-企业端-会议通知-3
sender = "8821092414406"; sender = "8821092414406";
signature = "中汽中心标准所"; signature = "中汽中心标准所";
templateId = "";//todo 审核不通过 templateId = "b7742cdb2c524f3d8d08deb3d32f2d57";//todo 审核不通过
break; break;
case "QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD": case "QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD":
//中汽中心标准所-企业端-会议通知-4 //中汽中心标准所-企业端-会议通知-4
sender = "8821092414406"; sender = "8821092414406";
signature = "中汽中心标准所"; signature = "中汽中心标准所";
templateId = "";//todo 审核不通过 templateId = "4829c9fae6df47c881475672e186a497";//todo 审核不通过
//通知类短信，不需要存redis //通知类短信，不需要存redis
break; break;
case "QY_5_HYTZ_NOT_AUDIT": case "QY_5_HYTZ_NOT_AUDIT":
@@ -301,13 +323,13 @@ public class SendMessageServiceImpl implements SendMessageService {
//中汽中心标准所-企业端-会议通知-6 //中汽中心标准所-企业端-会议通知-6
sender = "8821092414406"; sender = "8821092414406";
signature = "中汽中心标准所"; signature = "中汽中心标准所";
templateId = "";//todo 审核不通过 templateId = "88e6b8880be640c8b7c91b9dbe0a7a85";//todo 审核不通过
break; break;
case "QY_7_WJTZ_MEETING_SEND": case "QY_7_WJTZ_MEETING_SEND":
//中汽中心标准所-企业端-文件通知-7 //中汽中心标准所-企业端-文件通知-7
sender = "8821092414406"; sender = "8821092414406";
signature = "中汽中心标准所"; signature = "中汽中心标准所";
templateId = "";//todo 审核不通过 templateId = "2238fbb4e3fd4ff68bb47e872e7c9a05";//todo 审核不通过
//通知类短信，不需要存redis //通知类短信，不需要存redis
break; break;
case "QY_8_HTTZ_PHASE": case "QY_8_HTTZ_PHASE":
@@ -339,7 +361,7 @@ public class SendMessageServiceImpl implements SendMessageService {
//中汽中心标准所-企业端-文件通知-12 //中汽中心标准所-企业端-文件通知-12
sender = "8821092414406"; sender = "8821092414406";
signature = "中汽中心标准所"; signature = "中汽中心标准所";
templateId = "";//todo 审核不通过 templateId = "e1a089109aaa4820927d488613171b54";//todo 审核不通过
break; break;
default: default:
throw new JeroBootException("codeType flase."); throw new JeroBootException("codeType flase.");
@@ -360,9 +382,11 @@ public class SendMessageServiceImpl implements SendMessageService {
sb.append("["); sb.append("[");
String[] s = str.split(","); String[] s = str.split(",");
for (int i = 0; i < s.length; i++) { for (int i = 0; i < s.length; i++) {
sb.append("\"" + map.get(s[i]) + "\""); if(map.containsKey(s[i])){
if(i < (s.length - 1)){ sb.append("\"" + map.get(s[i]) + "\"");
sb.append(","); if(i < (s.length - 1)){
sb.append(",");
}
} }
} }
sb.append("]"); sb.append("]");
@@ -371,7 +395,7 @@ public class SendMessageServiceImpl implements SendMessageService {
sysBaseAPI.sendMessage(sendMessageDTO.getPhone(),sender,templateId,signature,templateParas); sysBaseAPI.sendMessage(sendMessageDTO.getPhone(),sender,templateId,signature,templateParas);
}catch (Exception e){ }catch (Exception e){
log.error("发送短信异常",e); log.error("发送短信异常",e);
// throw new JeroBootException("短信发送失败！"); throw new JeroBootException("短信发送失败！");
} }
} }
} }
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+2 -2
View File
@@ -244,7 +244,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
payCompanyManagement.setStatus(PayCompanyManagementCommon.STATUS2); payCompanyManagement.setStatus(PayCompanyManagementCommon.STATUS2);
payCompanyManagementService.save(payCompanyManagement); payCompanyManagementService.save(payCompanyManagement);
// 获取项目负责人，发送消息 // 获取项目负责人，发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY)); List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
if(!CollectionUtils.isEmpty(list)){ if(!CollectionUtils.isEmpty(list)){
list.forEach(item->{ list.forEach(item->{
// 发送消息 // 发送消息
@@ -333,7 +333,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
payCompanyManagementService.save(payCompanyManagement); payCompanyManagementService.save(payCompanyManagement);
if(Objects.equals(dataSource,PayCompanyManagementCommon.DATA_SOURCE2)){ if(Objects.equals(dataSource,PayCompanyManagementCommon.DATA_SOURCE2)){
// 获取项目负责人，发送消息 // 获取项目负责人，发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY)); List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
if(!CollectionUtils.isEmpty(list)){ if(!CollectionUtils.isEmpty(list)){
list.forEach(item->{ list.forEach(item->{
// 发送消息 // 发送消息