diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardParser.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardParser.java index c2b8a496..f85f88a0 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardParser.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardParser.java @@ -60,11 +60,11 @@ class CardParser { CardStateInfo stateInfo = card.getStateInfo(); if (cardTemplate.isUpdatable()) { content.setCardState(stateInfo.getCardState()); - content.setBizState(stateInfo.getBizStateCode()); + content.setBizState(stateInfo.getBizState()); } content.setStateImage(CardStateImageConfigs .create(template.getStateImageConfigs()) - .determineStateImage(stateInfo.getBizStateCode())); + .determineStateImage(stateInfo.getBizState())); if (StringUtils.isNotBlank(card.getSubtitle())) { GeneralMessagePushVO.Subtitle subtitle = new GeneralMessagePushVO.Subtitle(); subtitle.setIconUrl(messageSystemConfig.getOrgIcon()); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java index 1b49ac6b..bd146af4 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java @@ -76,7 +76,7 @@ public class CardSupport { card.setSubBizCode(sendModel.getRequest().getSubBizCode()); card.setTemplateCode(sendModel.getRequest().getTemplateCode()); CardStateInfo stateInfo = sendModel.getRequest().getStateInfo(); - card.setBizState(stateInfo.getBizStateCode()); + card.setBizState(stateInfo.getBizState()); card.setCardState(stateInfo.getCardState()); card.setTitle(sendModel.getTemplate().getTitle()); card.setContent(sendModel.getTemplate().getContent()); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardStateInfo.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardStateInfo.java index c9b33646..38e1d5d2 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardStateInfo.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardStateInfo.java @@ -14,7 +14,7 @@ public class CardStateInfo { /** * 业务状态编辑 */ - private String bizStateCode; + private String bizState; /** * 卡片状态 diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/CardDao.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/CardDao.java index b9f79541..8fa5aebc 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/CardDao.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/CardDao.java @@ -33,7 +33,7 @@ public class CardDao extends ServiceImpl { .collect(Collectors.toList()); lambdaUpdate() .in(Card::getId, cardIds) - .set(stateInfo.getBizStateCode() != null, Card::getBizState, stateInfo.getBizStateCode()) + .set(stateInfo.getBizState() != null, Card::getBizState, stateInfo.getBizState()) .set(stateInfo.getCardState() != null, Card::getCardState, stateInfo.getCardState()) .update(); } diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java index b2fcb7a7..6aae49e0 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/Card.java @@ -177,7 +177,7 @@ public class Card extends BaseEntityExt implements CardContent { @Override public CardStateInfo getStateInfo() { CardStateInfo cardStateInfo = new CardStateInfo(); - cardStateInfo.setBizStateCode(bizState); + cardStateInfo.setBizState(bizState); cardStateInfo.setCardState(cardState); return cardStateInfo; }