From 9d66383ec278bb723854f61fc87bcd21db2666ba Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Fri, 17 Dec 2021 18:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BC=81=E4=B8=9A=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=90=8C=E6=AD=A5=E5=88=B0=E6=9D=A5=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayContactsManagementController.java       |  6 ------
 .../impl/PayContactsManagementServiceImpl.java |  3 +++
 .../MemberMessageSyncController.java           | 18 ++++++++++--------
 .../modules/system/entity/SysAnnouncement.java |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 7b945800..000fa977 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -301,12 +301,6 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		}catch (Exception e){
 			log.error("手机号、邮箱加密异常！",e);
 		}
-		// 变更企业，删除原有用户
-//		if(!Objects.equals(payContactsManagement.getCompanyId(),payContactsManagementOld.getCompanyId())){
-//
-//		}else{
-//
-//		}
 
 		LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
 		updatePayContactsManagement.eq(PayContactsManagement::getId,payContactsManagement.getId());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
index ab6b7954..bf16e722 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
@@ -205,6 +205,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         if(!StringUtils.isBlank(payContactsManagement.getRoleCode())){
             updatePayContactsManagement.set(PayContactsManagement::getRoleCode,payContactsManagement.getRoleCode());
         }
+        if(!StringUtils.isBlank(payContactsManagement.getMemberNature())){
+            updatePayContactsManagement.set(PayContactsManagement::getMemberNature,payContactsManagement.getMemberNature());
+        }
         update(updatePayContactsManagement);
 //		 payContactsManagementService.updateById(payContactsManagement);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/MemberMessageSyncController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/MemberMessageSyncController.java
index 1df1efac..9f0c6443 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/MemberMessageSyncController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/MemberMessageSyncController.java
@@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @ClassName MemberMessageSyncController
@@ -95,9 +92,14 @@ public class MemberMessageSyncController {
             announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2);
             announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
             sysAnnouncementService.save(announcement);
+            String[] s = announcement.getPhone().split(",");
+            List<String> list = new ArrayList<>();
+            for (int i = 0; i < s.length; i++) {
+                list.add(PasswordUtil.encrypt(s[i]));
+            }
             // 2.插入用户通告阅读标记表记录
             LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
-            queryPayContactsManagement.in(PayContactsManagement::getPhone, Arrays.asList(announcement.getPhones().split(",")));
+            queryPayContactsManagement.in(PayContactsManagement::getPhone, list);
             List<PayContactsManagement> listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement);
             String anntId = announcement.getId();
             if(!CollectionUtils.isEmpty(listPayContactsManagement)){
@@ -105,15 +107,15 @@ public class MemberMessageSyncController {
                 listPayContactsManagement.forEach(p->{
                     SysAnnouncementSend announcementSend = new SysAnnouncementSend();
                     announcementSend.setAnntId(anntId);
-                    announcementSend.setUserId(PasswordUtil.decrypt(p.getPhone()));
+                    announcementSend.setUserId(p.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, PasswordUtil.decrypt(p.getPhone()));
+                    obj.put(WebsocketConst.MSG_USER_ID, p.getId());
                     obj.put(WebsocketConst.MSG_ID, announcement.getId());
                     obj.put(WebsocketConst.MSG_TXT, finalAlert);
-                    webSocket.sendMessage(PasswordUtil.decrypt(p.getPhone()), obj.toJSONString());
+                    webSocket.sendMessage(p.getId(), obj.toJSONString());
                 });
             }else{
                 log.info("会员同步来款消息发送失败，用户不存在！");
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
index e8f36036..039c4fed 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
@@ -153,5 +153,5 @@ public class SysAnnouncement implements Serializable {
      * 手机号
      */
     @TableField(exist = false)
-    private String phones;
+    private String phone;
 }