From 5b53bd733dd7949ddb1980c7a31c145cbdd0a95e Mon Sep 17 00:00:00 2001
From: zhangyx <1254353766@qq.com>
Date: Mon, 25 Oct 2021 14:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E4=BA=BA=E5=8F=91=E9=80=81=E4=BA=BA=E5=90=8D=E7=BB=99?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BizSendMsgTemplateServiceImpl.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 746a2df..14e038b 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
@@ -71,7 +71,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
                     String taskForm = msgTemplate.getTaskForm();
                     if (StringUtils.equals("realtime", taskForm)) {
                         //发送短信
-                        sendSms( msgInfo,  receiver,  magContent);
+                        sendSms( msgInfo,  receiver,  magContent, taskForm);
                     }
                     else if (StringUtils.equals("timing", taskForm)) {
                         BizSendMsgLog msgLog = new BizSendMsgLog();
@@ -84,7 +84,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
                         List<BizSendMsgLog> msgLogList = msgLogService.list(queryWrapper);
                         if (msgLogList.isEmpty()){
                             //发送短信
-                            sendSms( msgInfo,  receiver,  magContent);
+                            sendSms( msgInfo,  receiver,  magContent, taskForm);
                         }
                     }
                 });
@@ -104,11 +104,16 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
      * @param magContent
      * @return
      */
-    public boolean sendSms(BizSendMsgInfo msgInfo, BizReceiverVO receiver, String magContent) {
+    public boolean sendSms(BizSendMsgInfo msgInfo, BizReceiverVO receiver, String magContent, String taskForm) {
         boolean result = false;
         //当前用户userId
         String userId = cacheUserService.getCacheUser().getUserId();//"ex-wanghy623";
         String userName = cacheUserService.getCacheUser().getFullName();//"曹鹏";
+        if (StringUtils.equals("timing", taskForm)) {
+            userId = "system-timing-task";
+            userName = "系统定时任务";
+        }
+
         BizSendMsgVO msgVO = new BizSendMsgVO();
         msgVO.setSendUid(userId)
                 .setSendUName(userName)