From 471227db7d6dd5e039f6fe7f1778e34c42df85f5 Mon Sep 17 00:00:00 2001
From: zhangyx <1254353766@qq.com>
Date: Thu, 11 Nov 2021 14:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8A=9F=E8=83=BD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BizSendMsgLog.java                   |  2 +-
 .../impl/BizSendMsgTemplateServiceImpl.java     | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgLog.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgLog.java
index 8fea182..20d8c07 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgLog.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgLog.java
@@ -70,7 +70,7 @@ public class BizSendMsgLog implements Serializable {
         /**
         * 发送状态；0-失败；1-成功
         */
-        @ApiModelProperty(value = "发送状态；0-失败；1-成功")
+        @ApiModelProperty(value = "发送状态；0-失败；1-成功；2-短信功能未开启")
         private Integer status;
 
         /**
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 9f58ef6..58ec8df 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
@@ -118,10 +118,17 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
                 .setSendUName(userName)
                 .setStrMobileNumberr(receiver.getReceiverAccount())
                 .setStrContent(magContent);
-        //发送短信
-        result = msgService.sendMsg(msgVO);
+        //active使能（1：是；0：否）
+        int active =funcSwitchConfigMapper.selectByType("send-sms-func");
+        //发送状态；0-失败；1-成功；2-短信功能未开启
+        int sendResult = 2;
+        if (active==1) {
+            //发送短信
+            result = msgService.sendMsg(msgVO);
+            sendResult = result?1:0;
+        }
         //保存日志
-        savaLog(msgInfo, result, receiver, magContent, taskForm);
+        savaLog(msgInfo, sendResult, receiver, magContent, taskForm);
         return result;
     }
 
@@ -131,7 +138,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
      * @param result
      * @param receiverVO
      */
-    public void savaLog(BizSendMsgInfo msgInfo, boolean result, BizReceiverVO receiverVO, String magContent, String taskForm) {
+    public void savaLog(BizSendMsgInfo msgInfo, int result, BizReceiverVO receiverVO, String magContent, String taskForm) {
         //当前用户userId
         String userId = cacheUserService.getCacheUser().getUserId();//"ex-wanghy623";
         String userName = cacheUserService.getCacheUser().getFullName();//"曹鹏";
@@ -148,7 +155,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
                 .setReceiverCompanyId(receiverVO.getReceiverCompanyId())
                 .setReceiverCompanyName(receiverVO.getReceiverCompanyName())
                 .setReceiverAccount(receiverVO.getReceiverAccount())
-                .setStatus(result?1:0)//发送状态；0-失败；1-成功
+                .setStatus(result)//发送状态；0-失败；1-成功；2-短信功能未开启
                 .setSendTime(LocalDateTime.now())
                 .setProjectId(msgInfo.getProjectId())
                 .setProjectName(msgInfo.getProjectName())