From a14d1dd06ccb5d027227d8d8f0d85a3f5d93832f Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Tue, 7 Mar 2023 08:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF=E5=8A=A0?=
=?UTF-8?q?=E5=90=AF=E7=94=A8=E6=A0=87=E8=AF=86=E6=A0=B9=E6=8D=AE=E6=A0=87?=
=?UTF-8?q?=E8=AF=86=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81?=
=?UTF-8?q?=E7=9F=AD=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dao/mapper/BizSendMsgTemplateMapper.xml | 1 +
.../entity/BizSendMsgTemplate.java | 6 ++-
.../impl/BizSendMsgTemplateServiceImpl.java | 49 ++++++++++---------
3 files changed, 32 insertions(+), 24 deletions(-)
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 2d4440d..4f3badd 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,6 +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 e5939f5..f620cf7 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
@@ -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 using;
}
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 58ec8df..868788a 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
@@ -60,33 +60,36 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl query = new QueryWrapper<>(new BizSendMsgTemplate().setTemplateId(templateId));
//获得短信模板信息
BizSendMsgTemplate msgTemplate = this.getOne(query);
- //替换字段，形成需要发送的短信内容
- String magContent = generateMsgFromTemplete(msgTemplate.getContent(), msgInfo.getTempParamMap());
+ if(msgTemplate.getUsing()==1){
- //接收人
- List receiverList = msgInfo.getReceiverList();
- receiverList.forEach(receiver -> {
- //任务形式：realtime实时；timing-定时
- String taskForm = msgTemplate.getTaskForm();
- if (StringUtils.equals("realtime", 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 queryWrapper = Wrappers.lambdaQuery(msgLog);
- //定时短信，查询当前收信人是或否发送过，发送过则不再发送短信
- List msgLogList = msgLogService.list(queryWrapper);
- if (msgLogList.isEmpty()){
+ //替换字段，形成需要发送的短信内容
+ String magContent = generateMsgFromTemplete(msgTemplate.getContent(), msgInfo.getTempParamMap());
+
+ //接收人
+ List receiverList = msgInfo.getReceiverList();
+ receiverList.forEach(receiver -> {
+ //任务形式：realtime实时；timing-定时
+ String taskForm = msgTemplate.getTaskForm();
+ if (StringUtils.equals("realtime", 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 queryWrapper = Wrappers.lambdaQuery(msgLog);
+ //定时短信，查询当前收信人是或否发送过，发送过则不再发送短信
+ List msgLogList = msgLogService.list(queryWrapper);
+ if (msgLogList.isEmpty()){
+ //发送短信
+ sendSms( msgInfo, receiver, magContent, taskForm);
+ }
+ }
+ });
+ }
}
else if (StringUtils.equals("intraMail", sendType)) {
}