liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Master 短信加是否启用标识

See merge request eshop/biz_service_ebtp_extend!5
This commit is contained in:
jlyanss
2023-03-31 13:56:27 +00:00
parent 468e9d14bb f65ab04f2d
commit f676b30e7d
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
<result column="task_form" jdbcType="VARCHAR" property="taskForm"/> <result column="task_form" jdbcType="VARCHAR" property="taskForm"/>
<result column="receiver" jdbcType="VARCHAR" property="receiver"/> <result column="receiver" jdbcType="VARCHAR" property="receiver"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/> <result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="use_flag" jdbcType="INTEGER" property="useFlag"/>
<result column="purchasing_method" jdbcType="VARCHAR" property="purchasingMethod"/> <result column="purchasing_method" jdbcType="VARCHAR" property="purchasingMethod"/>
</resultMap> </resultMap>
</mapper> </mapper>

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

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

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

@ -60,33 +60,36 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
QueryWrapper<BizSendMsgTemplate> query = new QueryWrapper<>(new BizSendMsgTemplate().setTemplateId(templateId)); QueryWrapper<BizSendMsgTemplate> query = new QueryWrapper<>(new BizSendMsgTemplate().setTemplateId(templateId));
//获得短信模板信息 //获得短信模板信息
BizSendMsgTemplate msgTemplate = this.getOne(query); BizSendMsgTemplate msgTemplate = this.getOne(query);
//替换字段，形成需要发送的短信内容 if(msgTemplate.getUseFlag()!=null && msgTemplate.getUseFlag()==1){
String magContent = generateMsgFromTemplete(msgTemplate.getContent(), msgInfo.getTempParamMap());
//接收人 //替换字段，形成需要发送的短信内容
List<BizReceiverVO> receiverList = msgInfo.getReceiverList(); String magContent = generateMsgFromTemplete(msgTemplate.getContent(), msgInfo.getTempParamMap());
receiverList.forEach(receiver -> {
//任务形式：realtime实时；timing-定时 //接收人
String taskForm = msgTemplate.getTaskForm(); List<BizReceiverVO> receiverList = msgInfo.getReceiverList();
if (StringUtils.equals("realtime", taskForm)) { receiverList.forEach(receiver -> {
//发送短信 //任务形式：realtime实时；timing-定时
sendSms( msgInfo, receiver, magContent, taskForm); String taskForm = msgTemplate.getTaskForm();
} if (StringUtils.equals("realtime", taskForm)) {
else if (StringUtils.equals("timing", taskForm)) {
BizSendMsgLog msgLog = new BizSendMsgLog();
BeanUtils.copyProperties(msgInfo, msgLog);
msgLog.setReceiverCompanyId(receiver.getReceiverCompanyId())
.setReceiverCompanyName(receiver.getReceiverCompanyName())
.setReceiverAccount(receiver.getReceiverAccount());
LambdaQueryWrapper<BizSendMsgLog> queryWrapper = Wrappers.lambdaQuery(msgLog);
//定时短信，查询当前收信人是或否发送过，发送过则不再发送短信
List<BizSendMsgLog> msgLogList = msgLogService.list(queryWrapper);
if (msgLogList.isEmpty()){
//发送短信 //发送短信
sendSms( msgInfo, receiver, magContent, taskForm); sendSms( msgInfo, receiver, magContent, taskForm);
} }
} else if (StringUtils.equals("timing", taskForm)) {
}); BizSendMsgLog msgLog = new BizSendMsgLog();
BeanUtils.copyProperties(msgInfo, msgLog);
msgLog.setReceiverCompanyId(receiver.getReceiverCompanyId())
.setReceiverCompanyName(receiver.getReceiverCompanyName())
.setReceiverAccount(receiver.getReceiverAccount());
LambdaQueryWrapper<BizSendMsgLog> queryWrapper = Wrappers.lambdaQuery(msgLog);
//定时短信，查询当前收信人是或否发送过，发送过则不再发送短信
List<BizSendMsgLog> msgLogList = msgLogService.list(queryWrapper);
if (msgLogList.isEmpty()){
//发送短信
sendSms( msgInfo, receiver, magContent, taskForm);
}
}
});
}
} }
else if (StringUtils.equals("intraMail", sendType)) { else if (StringUtils.equals("intraMail", sendType)) {
} }