Merge branch 'master-短信加是否启用标识' into 'uat_code'
短信模板加启用标识根据标识判断是否发送短信 See merge request eshop/biz_service_ebtp_extend!4
This commit is contained in:
@ -13,7 +13,7 @@
|
||||
<result column="task_form" jdbcType="VARCHAR" property="taskForm"/>
|
||||
<result column="receiver" jdbcType="VARCHAR" property="receiver"/>
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark"/>
|
||||
<result column="using" jdbcType="INTEGER" property="using"/>
|
||||
<result column="use_flag" jdbcType="INTEGER" property="useFlag"/>
|
||||
<result column="purchasing_method" jdbcType="VARCHAR" property="purchasingMethod"/>
|
||||
</resultMap>
|
||||
</mapper>
|
@ -91,6 +91,6 @@ public class BizSendMsgTemplate implements Serializable {
|
||||
* 是否启用
|
||||
*/
|
||||
@ApiModelProperty(value = "是否启用 0-否 1-是")
|
||||
private Integer using;
|
||||
private Integer useFlag;
|
||||
|
||||
}
|
||||
|
@ -65,7 +65,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
|
||||
QueryWrapper<BizSendMsgTemplate> 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());
|
||||
|
Reference in New Issue
Block a user