|
|
@ -45,7 +45,6 @@ import java.util.stream.Collectors; |
|
|
|
public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper, PushConcernFan> implements IPushConcernFanService { |
|
|
|
public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper, PushConcernFan> implements IPushConcernFanService { |
|
|
|
|
|
|
|
|
|
|
|
private final OkHttpClient okHttpClient; |
|
|
|
private final OkHttpClient okHttpClient; |
|
|
|
private final IPushConcernFanService iPushConcernFanService; |
|
|
|
|
|
|
|
private final IPushBlacklistService iPushBlacklistService; |
|
|
|
private final IPushBlacklistService iPushBlacklistService; |
|
|
|
private final IPushChatMessageService iPushChatMessageService; |
|
|
|
private final IPushChatMessageService iPushChatMessageService; |
|
|
|
private final IPushConcernFanTypeService iPushConcernFanTypeService; |
|
|
|
private final IPushConcernFanTypeService iPushConcernFanTypeService; |
|
|
@ -76,7 +75,7 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper, |
|
|
|
if (StrUtil.equals(pushChatMessage.getConcernFanStatus(), "1")) { |
|
|
|
if (StrUtil.equals(pushChatMessage.getConcernFanStatus(), "1")) { |
|
|
|
if (StrUtil.isBlank(pushChatMessage.getAlias())) throw new CheckedException("当前推送用户别名ID必填!"); |
|
|
|
if (StrUtil.isBlank(pushChatMessage.getAlias())) throw new CheckedException("当前推送用户别名ID必填!"); |
|
|
|
// 查询对方是否有关注推送用户
|
|
|
|
// 查询对方是否有关注推送用户
|
|
|
|
PushConcernFan pushConcernFan = iPushConcernFanService.getOne(Wrappers.<PushConcernFan>lambdaQuery() |
|
|
|
PushConcernFan pushConcernFan = super.getOne(Wrappers.<PushConcernFan>lambdaQuery() |
|
|
|
.eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) |
|
|
|
.eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) |
|
|
|
.eq(PushConcernFan::getFanUserId, pushChatMessage.getAlias()) |
|
|
|
.eq(PushConcernFan::getFanUserId, pushChatMessage.getAlias()) |
|
|
|
.eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED)); |
|
|
|
.eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED)); |
|
|
@ -96,7 +95,7 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper, |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// 配置推送用户,针对粉丝支持多人推送
|
|
|
|
// 配置推送用户,针对粉丝支持多人推送
|
|
|
|
if (StrUtil.isBlank(pushChatMessage.getAlias())) { |
|
|
|
if (StrUtil.isBlank(pushChatMessage.getAlias())) { |
|
|
|
List<PushConcernFan> pushConcernFanList = iPushConcernFanService.list(Wrappers.<PushConcernFan>lambdaQuery() |
|
|
|
List<PushConcernFan> pushConcernFanList = super.list(Wrappers.<PushConcernFan>lambdaQuery() |
|
|
|
.eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) |
|
|
|
.eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) |
|
|
|
.eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED)); |
|
|
|
.eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED)); |
|
|
|
pushChatMessage.setAlias(pushConcernFanList.stream().map(item -> item.getConcernUserId()).collect(Collectors.joining())); |
|
|
|
pushChatMessage.setAlias(pushConcernFanList.stream().map(item -> item.getConcernUserId()).collect(Collectors.joining())); |
|
|
|