feat:异常处理
This commit is contained in:
@@ -7,8 +7,8 @@ package com.cool.store.enums.notice;
|
|||||||
*/
|
*/
|
||||||
public enum RemindTypeEnum {
|
public enum RemindTypeEnum {
|
||||||
|
|
||||||
CONTINUOUS_REMINDER(0,"持续提醒"),
|
CONTINUOUS_REMINDER(1,"持续提醒"),
|
||||||
STAGE_REMINDER(1,"阶段提醒"),
|
STAGE_REMINDER(2,"阶段提醒"),
|
||||||
;
|
;
|
||||||
|
|
||||||
RemindTypeEnum(Integer code, String message) {
|
RemindTypeEnum(Integer code, String message) {
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
|
|||||||
messageTemplateDO.setDeadline(thirdMatterRequest.getDeadline());
|
messageTemplateDO.setDeadline(thirdMatterRequest.getDeadline());
|
||||||
messageTemplateDO.setTodayTask(thirdMatterRequest.getTodayTask());
|
messageTemplateDO.setTodayTask(thirdMatterRequest.getTodayTask());
|
||||||
messageTemplateDO.setMessageImage(thirdMatterRequest.getMessageImage());
|
messageTemplateDO.setMessageImage(thirdMatterRequest.getMessageImage());
|
||||||
messageTemplateDO.setPublishStatus(PublishStatusEnum.PUBLISHED.getCode());
|
messageTemplateDO.setPublishStatus(PublishStatusEnum.UNPUBLISHED.getCode());
|
||||||
messageTemplateDO.setJumpType(matterConfig.getJumpType());
|
messageTemplateDO.setJumpType(matterConfig.getJumpType());
|
||||||
messageTemplateDO.setJumpUrl(matterConfig.getJumpUrl());
|
messageTemplateDO.setJumpUrl(matterConfig.getJumpUrl());
|
||||||
|
|
||||||
@@ -235,7 +235,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
|
|||||||
}
|
}
|
||||||
//人员
|
//人员
|
||||||
List<EnterpriseUserDO> userInfoByUserMobileList = enterpriseUserDAO.getUserInfoByUserMobileList(thirdMatterRequest.getMobileList());
|
List<EnterpriseUserDO> userInfoByUserMobileList = enterpriseUserDAO.getUserInfoByUserMobileList(thirdMatterRequest.getMobileList());
|
||||||
if (CollectionUtils.isEmpty(userInfoByUserMobileList)){
|
if (CollectionUtils.isNotEmpty(userInfoByUserMobileList)){
|
||||||
//组装人员信息
|
//组装人员信息
|
||||||
List<CommonDTO> userList = new ArrayList<>();
|
List<CommonDTO> userList = new ArrayList<>();
|
||||||
userInfoByUserMobileList.forEach(x -> {
|
userInfoByUserMobileList.forEach(x -> {
|
||||||
@@ -248,14 +248,14 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
|
|||||||
//校验是否发布
|
//校验是否发布
|
||||||
if (StringUtils.isEmpty(userInfo)|| StringUtils.isEmpty(storeInfo)){
|
if (StringUtils.isEmpty(userInfo)|| StringUtils.isEmpty(storeInfo)){
|
||||||
publishFlag = Boolean.FALSE;
|
publishFlag = Boolean.FALSE;
|
||||||
messageTemplateDO.setPublishStatus(PublishStatusEnum.UNPUBLISHED.getCode());
|
|
||||||
}
|
}
|
||||||
int messageId = messageTemplateDAO.insert(messageTemplateDO);
|
messageTemplateDO.setCreateUserId("system");
|
||||||
|
messageTemplateDAO.insert(messageTemplateDO);
|
||||||
//调用发布
|
//调用发布
|
||||||
if (publishFlag){
|
if (publishFlag){
|
||||||
//开始计算人员门店
|
//开始计算人员门店
|
||||||
BatchPublishRequest batchPublishRequest = new BatchPublishRequest();
|
BatchPublishRequest batchPublishRequest = new BatchPublishRequest();
|
||||||
batchPublishRequest.setIds(Arrays.asList(Long.valueOf(messageId)));
|
batchPublishRequest.setIds(Arrays.asList(messageTemplateDO.getId()));
|
||||||
batchPublishRequest.setStoreInfoList(JSONObject.parseArray(storeInfo, CommonDTO.class));
|
batchPublishRequest.setStoreInfoList(JSONObject.parseArray(storeInfo, CommonDTO.class));
|
||||||
batchPublishRequest.setUserInfoList(JSONObject.parseArray(userInfo, CommonDTO.class));
|
batchPublishRequest.setUserInfoList(JSONObject.parseArray(userInfo, CommonDTO.class));
|
||||||
try {
|
try {
|
||||||
@@ -395,7 +395,9 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
|
|||||||
MessageDetailVO messageDetailVO = storeMessageDAO.getMessageDetail(id);
|
MessageDetailVO messageDetailVO = storeMessageDAO.getMessageDetail(id);
|
||||||
if (messageDetailVO!=null&&messageDetailVO.getPublishUserId()!=null){
|
if (messageDetailVO!=null&&messageDetailVO.getPublishUserId()!=null){
|
||||||
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(messageDetailVO.getPublishUserId());
|
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(messageDetailVO.getPublishUserId());
|
||||||
messageDetailVO.setPublishUserName(userInfoById.getName());
|
if (userInfoById != null){
|
||||||
|
messageDetailVO.setPublishUserName(userInfoById.getName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return messageDetailVO;
|
return messageDetailVO;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user