@ -85,18 +85,17 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
@@ -85,18 +85,17 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
throw new CheckedException ( "你的ip地址不正确,请检查推送应用中设置的ip地址!" ) ;
}
// 配置推送用户
if ( StrUtil . isBlank ( pushChatMessage . getAlias ( ) ) ) {
// 根据手机号筛选关联用户
if ( StrUtil . isNotBlank ( pushChatMessage . getPhone ( ) ) ) {
List < PushConcernFan > pushConcernFanList = pushConcernFanMapper . pushFriendByPhoneList ( pushChatMessage . getPhone ( ) ) ;
pushChatMessage . setAlias ( pushConcernFanList . stream ( ) . map ( PushConcernFan : : getFanUserId ) . collect ( Collectors . joining ( "," ) ) ) ;
// 不选择推送用户默认设置全部当前企业下的粉丝用户
} else if ( StrUtil . isBlank ( pushChatMessage . getAlias ( ) ) ) {
List < PushConcernFan > pushConcernFanList = iPushConcernFanService . list ( Wrappers . < PushConcernFan > 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 < PushConcernFan > 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 < PushBlacklist > pushBlacklists = iPushBlacklistService . list ( Wrappers . < PushBlacklist > lambdaQuery ( ) . eq ( PushBlacklist : : getFanUserId , pushChatMessage . getUserId ( ) ) ) ;
pushBlacklists . forEach ( item - > pushChatMessage . setAlias ( pushChatMessage . getAlias ( ) . replaceAll ( item . getConcernUserId ( ) + ",?" , "" ) ) ) ;