From 200fb626b85a59ad1472caf4557e4096f007ebf7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 29 Sep 2021 17:09:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=AD=A3=E5=B8=B8=E6=8E=A5=E6=94=B6=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SendMessageServiceImpl.java  | 29 ++++++++++++-------
 .../system/service/ISysUserService.java       |  9 ++++++
 .../service/impl/SysUserServiceImpl.java      |  6 ++++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
index 357fa2da..6f0d3454 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
@@ -18,6 +18,7 @@ import com.jero.modules.message.entity.SysMessageTemplate;
 import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
 import com.jero.modules.message.service.ISysMessageTemplateService;
 import com.jero.modules.message.websocket.WebSocket;
+import com.jero.modules.pay.company.entity.PayContactsManagement;
 import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysAnnouncementSend;
 import com.jero.modules.system.entity.SysUser;
@@ -27,6 +28,7 @@ import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -128,26 +130,33 @@ public class SendMessageServiceImpl implements SendMessageService {
                 announcement.setTemplateCode(sendMessageDTO.getTemplateCode());
                 sysAnnouncementService.save(announcement);
                 // 2.插入用户通告阅读标记表记录
-                String userId = toUser;
-                String[] userIds = userId.split(",");
+                String[] userIds = toUser.split(",");
                 String anntId = announcement.getId();
-                for(int i=0;i<userIds.length;i++) {
-                    if(oConvertUtils.isNotEmpty(userIds[i])) {
-                        SysUser sysUser = sysUserService.getUserByName(userIds[i]);
-                        if(Objects.isNull(sysUser)) {
-                            continue;
+                for (String id : userIds) {
+                    if (oConvertUtils.isNotEmpty(id)) {
+                        LoginUser user = new LoginUser();
+                        SysUser sysUser = sysUserService.getUserByName(id);
+                        if (Objects.isNull(sysUser)) {
+                            PayContactsManagement contactsManagement = sysUserService.getPayContactsManagementByPhone(PasswordUtil.encrypt(id));
+                            if (contactsManagement == null) {
+                                continue;
+                            } else {
+                                BeanUtils.copyProperties(contactsManagement, user);
+                            }
+                        } else {
+                            BeanUtils.copyProperties(sysUser, user);
                         }
                         SysAnnouncementSend announcementSend = new SysAnnouncementSend();
                         announcementSend.setAnntId(anntId);
-                        announcementSend.setUserId(sysUser.getId());
+                        announcementSend.setUserId(user.getId());
                         announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
                         sysAnnouncementSendService.save(announcementSend);
                         JSONObject obj = new JSONObject();
                         obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
-                        obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
+                        obj.put(WebsocketConst.MSG_USER_ID, user.getId());
                         obj.put(WebsocketConst.MSG_ID, announcement.getId());
                         obj.put(WebsocketConst.MSG_TXT, title);
-                        webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
+                        webSocket.sendMessage(user.getId(), obj.toJSONString());
                     }
                 }
             }catch (Exception e){
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
index a780a314..d5f2757c 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.vo.SysUserCacheInfo;
+import com.jero.modules.pay.company.entity.PayContactsManagement;
 import com.jero.modules.system.entity.SysUser;
 
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -250,4 +251,12 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	List<SysUser> getRolesUser(List<String> roleCode);
+	/**
+	 * 根据手机号查询企业联系人
+     * @param phone	手机号
+	 * @author lijiarao
+	 * @date 2021/9/29
+	 * @return PayContactsManagement
+	 */
+    PayContactsManagement getPayContactsManagementByPhone(String phone);
 }
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index cf45859b..93b1ddc2 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.*;
+import com.jero.modules.pay.company.entity.PayContactsManagement;
 import com.jero.modules.system.model.SysLoginVO;
 import com.jero.modules.system.vo.SysUserVo;
 import lombok.extern.slf4j.Slf4j;
@@ -553,6 +554,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return listSysUser;
 	}
 
+	@Override
+	public PayContactsManagement getPayContactsManagementByPhone(String phone) {
+		return userMapper.getPayContactsManagementByPhone(phone);
+	}
+
 	/**
 	 * 忘记密码校验
 	 * @param user