diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java index 3375217b..050f321c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java @@ -85,18 +85,17 @@ public class PushApplicationServiceImpl extends ServiceImpl pushConcernFanList = pushConcernFanMapper.pushFriendByPhoneList(pushChatMessage.getPhone()); + pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getFanUserId).collect(Collectors.joining(","))); + // 不选择推送用户默认设置全部当前企业下的粉丝用户 + } else if (StrUtil.isBlank(pushChatMessage.getAlias())) { List pushConcernFanList = iPushConcernFanService.list(Wrappers.lambdaQuery() .eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) .eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED.getValue())); - pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getConcernUserId).collect(Collectors.joining(","))); - // 根据手机号筛选关联用户 - } else if (StrUtil.isNotBlank(pushChatMessage.getPhone())) { - List pushConcernFanList = pushConcernFanMapper.pushFriendByPhoneList(pushChatMessage.getPhone()); - pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getConcernUserId).collect(Collectors.joining(","))); + pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getFanUserId).collect(Collectors.joining(","))); } - // 过滤黑名单,根据谁拉黑了推送方用户进行过滤推送用户 List pushBlacklists = iPushBlacklistService.list(Wrappers.lambdaQuery().eq(PushBlacklist::getFanUserId, pushChatMessage.getUserId())); pushBlacklists.forEach(item -> pushChatMessage.setAlias(pushChatMessage.getAlias().replaceAll(item.getConcernUserId() + ",?", ""))); diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java index de90f161..4d1c2f35 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java @@ -93,20 +93,13 @@ public class PushConcernFanServiceImpl extends ServiceImpl pushConcernFanList = super.list(Wrappers.lambdaQuery() .eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) .eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED.getValue())); - pushChatMessage.setAlias(pushConcernFanList.stream().map(item -> item.getConcernUserId()).collect(Collectors.joining(","))); + pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getFanUserId).collect(Collectors.joining(","))); } // 查询粉丝设置的推送类型,如果参数中没有指定则采用默认的推送类型 pushConcernFanTypeList = iPushConcernFanTypeService.list(Wrappers.lambdaQuery() .eq(PushConcernFanType::getConcernUserId, pushChatMessage.getUserId()) .eq(StrUtil.isNotBlank(pushChatMessage.getPushTypeId()), PushConcernFanType::getTypeId, pushChatMessage.getPushTypeId()) .eq(StrUtil.isBlank(pushChatMessage.getPushTypeId()), PushConcernFanType::getDefaultType, "1")); - // 配置推送用户 - if (StrUtil.isBlank(pushChatMessage.getAlias())) { - List pushConcernFanList = super.list(Wrappers.lambdaQuery() - .eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) - .eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED.getValue())); - pushChatMessage.setAlias(pushConcernFanList.stream().map(item -> item.getConcernUserId()).collect(Collectors.joining(","))); - } } // 过滤黑名单,根据谁拉黑了推送方用户进行过滤推送用户 diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml index 4eecf963..9620d4bd 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml @@ -177,7 +177,7 @@ del_flag = 0 and status = 2 - and concern_user_id = (select id from sso_enhanced_user_view where phone = #{phone} and status = 0 and del_flag = 0 limit 1) + and fan_user_id = (select id from sso_enhanced_user_view where phone = #{phone} and status = 0 and del_flag = 0 limit 1)