Merge branch 'master-短信加是否启用标识' into 'master'

Master 短信加是否启用标识

See merge request eshop/biz_service_ebtp_extend!5

src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml

@@ -13,6 +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="use_flag"  jdbcType="INTEGER" property="useFlag"/>
             <result column="purchasing_method"  jdbcType="VARCHAR" property="purchasingMethod"/>
     </resultMap>
 </mapper>

src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java

@@ -87,6 +87,10 @@ public class BizSendMsgTemplate implements Serializable {
     @ApiModelProperty(value = "采购方式:procurement_mode_1公开招标,2邀请招标,3公开比选,4公开招募,5竞争性谈判,6单一来源,7公开询价,8竞拍,9单一来源简化流程'")
     private String purchasingMethod;
 
-
+    /**
+     * 是否启用
+     */
+    @ApiModelProperty(value = "是否启用 0-否 1-是")
+    private Integer useFlag;
 
 }

src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java

@@ -60,6 +60,8 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
                 QueryWrapper<BizSendMsgTemplate> query = new QueryWrapper<>(new BizSendMsgTemplate().setTemplateId(templateId));
                 //获得短信模板信息
                 BizSendMsgTemplate msgTemplate = this.getOne(query);
+                if(msgTemplate.getUseFlag()!=null && msgTemplate.getUseFlag()==1){
+
                     //替换字段，形成需要发送的短信内容
                     String magContent = generateMsgFromTemplete(msgTemplate.getContent(), msgInfo.getTempParamMap());
 
@@ -88,6 +90,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
                         }
                     });
                 }
+            }
             else if (StringUtils.equals("intraMail", sendType)) {
             }
             else if (StringUtils.equals("extraMail", sendType)) {