diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml index 4f3badd..c860cdd 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java index f620cf7..32fb430 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java @@ -91,6 +91,6 @@ public class BizSendMsgTemplate implements Serializable { * 是否启用 */ @ApiModelProperty(value = "是否启用 0-否 1-是") - private Integer using; + private Integer useFlag; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java index 6373ccc..e055e00 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java @@ -65,7 +65,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl query = new QueryWrapper<>(new BizSendMsgTemplate().setTemplateId(templateId)); //获得短信模板信息 BizSendMsgTemplate msgTemplate = this.getOne(query); - if(msgTemplate.getUsing()==1){ + if(msgTemplate.getUseFlag()!=null && msgTemplate.getUseFlag()==1){ //替换字段,形成需要发送的短信内容 String magContent = generateMsgFromTemplete(msgTemplate.getContent(), msgInfo.getTempParamMap());