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 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 list = new ArrayList<>(); + for (int i = 0; i < s.length; i++) { + list.add(PasswordUtil.encrypt(s[i])); + } // 2.插入用户通告阅读标记表记录 LambdaQueryWrapper queryPayContactsManagement = new LambdaQueryWrapper<>(); - queryPayContactsManagement.in(PayContactsManagement::getPhone, Arrays.asList(announcement.getPhones().split(","))); + queryPayContactsManagement.in(PayContactsManagement::getPhone, list); List 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; }