From eae27a530e4988d7e53b24b1ee36c62c0a39dd34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 27 Aug 2025 14:42:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/notice/RemindTypeEnum.java | 4 ++-- .../service/impl/MessageTemplateServiceImpl.java | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RemindTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RemindTypeEnum.java index 86edff063..435e7078a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RemindTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/notice/RemindTypeEnum.java @@ -7,8 +7,8 @@ package com.cool.store.enums.notice; */ public enum RemindTypeEnum { - CONTINUOUS_REMINDER(0,"持续提醒"), - STAGE_REMINDER(1,"阶段提醒"), + CONTINUOUS_REMINDER(1,"持续提醒"), + STAGE_REMINDER(2,"阶段提醒"), ; RemindTypeEnum(Integer code, String message) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index b8d380362..9ca319667 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -205,7 +205,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { messageTemplateDO.setDeadline(thirdMatterRequest.getDeadline()); messageTemplateDO.setTodayTask(thirdMatterRequest.getTodayTask()); messageTemplateDO.setMessageImage(thirdMatterRequest.getMessageImage()); - messageTemplateDO.setPublishStatus(PublishStatusEnum.PUBLISHED.getCode()); + messageTemplateDO.setPublishStatus(PublishStatusEnum.UNPUBLISHED.getCode()); messageTemplateDO.setJumpType(matterConfig.getJumpType()); messageTemplateDO.setJumpUrl(matterConfig.getJumpUrl()); @@ -235,7 +235,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { } //人员 List userInfoByUserMobileList = enterpriseUserDAO.getUserInfoByUserMobileList(thirdMatterRequest.getMobileList()); - if (CollectionUtils.isEmpty(userInfoByUserMobileList)){ + if (CollectionUtils.isNotEmpty(userInfoByUserMobileList)){ //组装人员信息 List userList = new ArrayList<>(); userInfoByUserMobileList.forEach(x -> { @@ -248,14 +248,14 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { //校验是否发布 if (StringUtils.isEmpty(userInfo)|| StringUtils.isEmpty(storeInfo)){ publishFlag = Boolean.FALSE; - messageTemplateDO.setPublishStatus(PublishStatusEnum.UNPUBLISHED.getCode()); } - int messageId = messageTemplateDAO.insert(messageTemplateDO); + messageTemplateDO.setCreateUserId("system"); + messageTemplateDAO.insert(messageTemplateDO); //调用发布 if (publishFlag){ //开始计算人员门店 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.setUserInfoList(JSONObject.parseArray(userInfo, CommonDTO.class)); try { @@ -395,7 +395,9 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { MessageDetailVO messageDetailVO = storeMessageDAO.getMessageDetail(id); if (messageDetailVO!=null&&messageDetailVO.getPublishUserId()!=null){ EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(messageDetailVO.getPublishUserId()); - messageDetailVO.setPublishUserName(userInfoById.getName()); + if (userInfoById != null){ + messageDetailVO.setPublishUserName(userInfoById.getName()); + } } return messageDetailVO; }