diff --git a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/props/RoomThemeUserCustomizeServiceImpl.java b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/props/RoomThemeUserCustomizeServiceImpl.java index 89606850..9c6918ec 100644 --- a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/props/RoomThemeUserCustomizeServiceImpl.java +++ b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/props/RoomThemeUserCustomizeServiceImpl.java @@ -114,11 +114,11 @@ public class RoomThemeUserCustomizeServiceImpl implements RoomThemeUserCustomize } } // 推送通知 - officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() + /*officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() .toAccounts(cmd.getWaitApprovalUserIds()) .noticeType(OfficialNoticeTypeEnum.ROOM_THEME_NOT_PASS) .build() - ); + );*/ return; } @@ -133,11 +133,12 @@ public class RoomThemeUserCustomizeServiceImpl implements RoomThemeUserCustomize ); } // 推送通知 - officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() + /*officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() .toAccounts(cmd.getWaitApprovalUserIds()) .noticeType(OfficialNoticeTypeEnum.ROOM_THEME_PASS) .build() - ); + );*/ + } } diff --git a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserDataViolationServiceImpl.java b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserDataViolationServiceImpl.java index 59b0183e..b8b8e5d6 100644 --- a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserDataViolationServiceImpl.java +++ b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserDataViolationServiceImpl.java @@ -73,12 +73,12 @@ public class UserDataViolationServiceImpl implements UserDataViolationService { // 警告 if (ConsoleAccountStatusEnum.WARNING.eq(param.getAccountStatusEnum())) { - officialNoticeClient.send( + /*officialNoticeClient.send( NoticeExtTemplateCustomizeCmd.builder().toAccount(param.getBeApprovalUserId()) .noticeType(OfficialNoticeTypeEnum.USER_WARNING) .content(param.getDescriptionContent()) .expand(null) - .build()); + .build());*/ } // 冻结 else if (ConsoleAccountStatusEnum.FREEZE.eq(param.getAccountStatusEnum())) { diff --git a/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/common/RecycleReimburseOrderProductCommon.java b/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/common/RecycleReimburseOrderProductCommon.java index b5838d23..f45bc452 100644 --- a/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/common/RecycleReimburseOrderProductCommon.java +++ b/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/common/RecycleReimburseOrderProductCommon.java @@ -264,7 +264,7 @@ public class RecycleReimburseOrderProductCommon { appendUserDecrQuantity(userDecrQuantity, gifts, decrQuantity); }); - userDecrQuantity.forEach((userId, val) -> + /* userDecrQuantity.forEach((userId, val) -> // 此次退款扣除主播目标通知. officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() .toAccount(userId) @@ -274,7 +274,7 @@ public class RecycleReimburseOrderProductCommon { .put("targetQuantity", val.stripTrailingZeros().toPlainString()) .build()) .build()) - ); + );*/ return listGive.stream().map(GiftCountAnchorDailyRunningWaterDTO::getId).collect( Collectors.toList()); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/PropsGiveAwayCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/PropsGiveAwayCmdExe.java index 1badea11..6d440584 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/PropsGiveAwayCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/material/PropsGiveAwayCmdExe.java @@ -101,7 +101,7 @@ public class PropsGiveAwayCmdExe { return; } - officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() + /*officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() .toAccount(cmd.getAcceptUserId()) .noticeType(OfficialNoticeTypeEnum.GIVE_AWAY_PROPS) .templateParam(Map.of("nickname", @@ -109,7 +109,7 @@ public class PropsGiveAwayCmdExe { .getUserNickname() , "effectDuration", TimestampUtils.between(TimestampUtils.now(), propsBackpack.getExpireTime()).toDays())) - .build()); + .build());*/ } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomThemeUseCustomizeThemeCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomThemeUseCustomizeThemeCmdExe.java index 573f9581..1821ab10 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomThemeUseCustomizeThemeCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomThemeUseCustomizeThemeCmdExe.java @@ -64,7 +64,7 @@ public class RoomThemeUseCustomizeThemeCmdExe { ); if (roomThemeUserCustomizeService.save(customizeRoomUserTheme)) { - officialNoticeClient.send(cmd.requiredReqUserId(), OfficialNoticeTypeEnum.ROOM_THEME_PENDING); +// officialNoticeClient.send(cmd.requiredReqUserId(), OfficialNoticeTypeEnum.ROOM_THEME_PENDING); } redisService.unlock(key); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/AgentInviteHostExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/AgentInviteHostExe.java index 0b3574b5..fc157b6d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/AgentInviteHostExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/AgentInviteHostExe.java @@ -192,12 +192,12 @@ public class AgentInviteHostExe { UserProfileDTO userProfile = userProfileAppConvertor.toUserProfileDTO( userProfileGateway.getByUserId(message.getInviteUserId())); ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, userProfile); - officialNoticeClient.send( + /*officialNoticeClient.send( NoticeExtTemplateTypeCmd.builder() .toAccount(message.getUserId()) .templateParam(OfficialNoticeUtils.buildUserProfile(userProfile)) .noticeType(noticeTypeEnum) .build() - ); + );*/ } } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdInviteMessageProcessExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdInviteMessageProcessExe.java index 0fb8bff5..c49c8080 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdInviteMessageProcessExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdInviteMessageProcessExe.java @@ -192,13 +192,13 @@ public class BdInviteMessageProcessExe { UserProfileDTO userProfile = userProfileAppConvertor.toUserProfileDTO( userProfileGateway.getByUserId(message.getInviteUserId())); ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, userProfile); - officialNoticeClient.send( + /*officialNoticeClient.send( NoticeExtTemplateTypeCmd.builder() .toAccount(message.getUserId()) .templateParam(OfficialNoticeUtils.buildUserProfile(userProfile)) .noticeType(noticeTypeEnum) .build() - ); + );*/ } } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdLeaderInviteBdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdLeaderInviteBdExe.java index 123c0659..30993bd5 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdLeaderInviteBdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdLeaderInviteBdExe.java @@ -87,13 +87,13 @@ public class BdLeaderInviteBdExe { userProfileGateway.getByUserId(cmd.requiredReqUserId()) ); - officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() + /*officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() .toAccount(cmd.getInviteUserId()) .noticeType(OfficialNoticeTypeEnum.BD_LEADER_SEND_INVITE_BD) .templateParam(OfficialNoticeUtils.buildUserProfile(userProfile)) .expand(messageId) .build() - ); + );*/ } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdLeaderInviteMessageProcessExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdLeaderInviteMessageProcessExe.java index 33f6ab94..c7841205 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdLeaderInviteMessageProcessExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/BdLeaderInviteMessageProcessExe.java @@ -121,14 +121,14 @@ public class BdLeaderInviteMessageProcessExe { userProfile.actualAccount())) .build()) .build(); - officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() + /*officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() .toAccount(message.getUserId()) .noticeType(noticeTypeEnum) .templateParam(MapBuilder.builder() .put("userProfile", String.format("%s(%s)", userProfile.getUserNickname(), userProfile.actualAccount())) .build()) - .build()); + .build());*/ } } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/TeamUserApplyJoinExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/TeamUserApplyJoinExe.java index 28553a90..1bfab50f 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/TeamUserApplyJoinExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/TeamUserApplyJoinExe.java @@ -184,7 +184,7 @@ public class TeamUserApplyJoinExe { if (StringUtils.isBlank(path)) { return; } - officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() + /*officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() .toAccount(teamProfile.getOwnUserId()) .noticeType(OfficialNoticeTypeEnum.USER_SEND_APPLY_TEAM) .templateParam(MapBuilder.builder() @@ -193,7 +193,7 @@ public class TeamUserApplyJoinExe { .build()) .expand(h5Url + path) .build() - ); + );*/ } } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserConfessionCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserConfessionCmdExe.java index 2e9a123f..ad264117 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserConfessionCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserConfessionCmdExe.java @@ -50,13 +50,13 @@ public class UserConfessionCmdExe { UserProfile userProfile = userProfileGateway.getByUserId(cmd.requiredReqUserId()); - officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() + /*officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder() .toAccount(confessionChance.getConfessionUserId()) .noticeType(OfficialNoticeTypeEnum.USER_CONFESSION) .templateParam(MapBuilder.builder() .put("nickname", userProfile.getUserNickname()) .build()) - .build()); + .build());*/ } } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/props/BadgeCommon.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/props/BadgeCommon.java index 5854c834..b169191e 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/props/BadgeCommon.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/props/BadgeCommon.java @@ -57,7 +57,7 @@ public class BadgeCommon { notActivateBadges.forEach(badgeConfig -> { if (ArithmeticUtils.gte(progressRate, BigDecimal.valueOf(badgeConfig.getMilestone()))) { if (badgeBackpackService.activationPermanent(userId, badgeConfig.getId())) { - officialNoticeClient.send(userId, lang, OfficialNoticeTypeEnum.BADGE_ACTIVATION); +// officialNoticeClient.send(userId, lang, OfficialNoticeTypeEnum.BADGE_ACTIVATION); } } }); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/CensorProfileListener.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/CensorProfileListener.java index b2ad1005..8f38b5d0 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/CensorProfileListener.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/CensorProfileListener.java @@ -263,7 +263,7 @@ public class CensorProfileListener implements MessageListener { userProfileGateway.updateUserAvatar(param.getUserId(), enumConfigCacheService.getValue(EnumConfigKey.VIOLATION_PICTURE, userProfile.getOriginSys())); - officialNoticeClient.send(param.getUserId(), OfficialNoticeTypeEnum.AVATAR_VIOLATION); +// officialNoticeClient.send(param.getUserId(), OfficialNoticeTypeEnum.AVATAR_VIOLATION); // 保存审批记录 ApprovalUserViolationHistory approvalUserViolationHistory = new ApprovalUserViolationHistory() diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java index 11af6746..a5ab2e8a 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java @@ -359,13 +359,13 @@ public class GiftCountStrategy implements GiftStrategy { UserProfile userProfile = userProfileRepository.getByUserId(runningWater.getUserId()); // 发送祝福通知 - officialService.send(NoticeExtTemplateTypeCmd.builder() + /* officialService.send(NoticeExtTemplateTypeCmd.builder() .toAccount(runningWater.getAcceptUsers().get(0).getAcceptUserId()) .noticeType(OfficialNoticeTypeEnum.CP_BLESS) .templateParam(MapBuilder.builder() .put("nickname", userProfile.getUserNickname()) .build()) - .build()); + .build());*/ } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/AppUserDataViolationServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/AppUserDataViolationServiceImpl.java index cd48d159..2c1a194f 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/AppUserDataViolationServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/AppUserDataViolationServiceImpl.java @@ -71,12 +71,12 @@ public class AppUserDataViolationServiceImpl implements AppUserDataViolationServ // 警告 if (ConsoleAccountStatusEnum.WARNING.eq(param.getAccountStatusEnum())) { - officialNoticeClient.send( + /*officialNoticeClient.send( NoticeExtTemplateCustomizeCmd.builder().toAccount(param.getBeApprovalUserId()) .noticeType(OfficialNoticeTypeEnum.USER_WARNING) .content(param.getDescriptionContent()) .expand(null) - .build()); + .build());*/ } // 冻结 else if (ConsoleAccountStatusEnum.FREEZE.eq(param.getAccountStatusEnum())) { diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/FeedbackClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/FeedbackClientServiceImpl.java index a85607ad..c6d0b167 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/FeedbackClientServiceImpl.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/FeedbackClientServiceImpl.java @@ -98,9 +98,9 @@ public class FeedbackClientServiceImpl implements .execute(); if (StringUtils.isNotEmpty(remarks) && !Objects.equals(userId, 0L)) { - officialNoticeClient.send(NoticeExtTemplateCustomizeCmd.builder().toAccount(userId) + /*officialNoticeClient.send(NoticeExtTemplateCustomizeCmd.builder().toAccount(userId) .noticeType(OfficialNoticeTypeEnum.FEEDBACK_PROCESS) - .content(remarks).build()); + .content(remarks).build());*/ } } @@ -125,9 +125,9 @@ public class FeedbackClientServiceImpl implements } }); if (CollectionUtils.isNotEmpty(userIds)) { - officialNoticeClient.send( + /*officialNoticeClient.send( NoticeExtTemplateTypeCmd.builder().toAccounts(new ArrayList<>(userIds)) - .noticeType(OfficialNoticeTypeEnum.FEEDBACK_PROCESS).build()); + .noticeType(OfficialNoticeTypeEnum.FEEDBACK_PROCESS).build());*/ } } }