Merge branch 'feature/REQ-1634' into 'dev'

+完成待办处理

See merge request universal/infrastructure/backend/msg-center-plat!97
This commit is contained in:
邬宇 2023-11-28 09:00:08 +00:00
commit 201c36cc75

View File

@ -321,8 +321,14 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
log.info("the [{}] record is updated complete by id.", param); log.info("the [{}] record is updated complete by id.", param);
String bizExtParam = null; String bizExtParam = null;
if(StringUtils.isNotBlank(param.getBizExtParams())){ if(StringUtils.isNotBlank(param.getBizExtParams())){
PendingMessageRecord pendingMessageRecord = pendingMessageRecordDao.lambdaQuery()
.eq(PendingMessageRecord::getId, param.getId())
.eq(PendingMessageRecord::getState, PendingMessageStateEnum.HAS_BEEN_SENT)
.eq(PendingMessageRecord::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.one();
String code = Optional.ofNullable(pendingMessageRecord.getTemplateCode()).orElseThrow(() -> new ServiceException("not found message template by id."));
MessageTemplateDTO msgTemplate = messageTemplateNewService MessageTemplateDTO msgTemplate = messageTemplateNewService
.queryEnableTemplateByCode(param.getTemplateCode()) .queryEnableTemplateByCode(code)
.orElseThrow(() -> new ServiceException("not found message template.")); .orElseThrow(() -> new ServiceException("not found message template."));
// 获取模板卡片信息 // 获取模板卡片信息
List<MessageCardContentItemDTO> rawCardContentItems = msgTemplate.getMsgCardContentItems(); List<MessageCardContentItemDTO> rawCardContentItems = msgTemplate.getMsgCardContentItems();