From aab443ce344e6537f6b861a780326a389fc72207 Mon Sep 17 00:00:00 2001 From: hy001 Date: Sat, 23 May 2026 20:09:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circle/other/app/command/user/SendCpApplyCmdExe.java | 3 --- .../other/app/common/cp/CpRelationC2cNoticeUtils.java | 7 ------- .../other/app/command/user/SendCpApplyCmdExeTest.java | 6 ++++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/SendCpApplyCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/SendCpApplyCmdExe.java index cf86681c..18cb6dc9 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/SendCpApplyCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/SendCpApplyCmdExe.java @@ -185,9 +185,6 @@ public class SendCpApplyCmdExe { CpRelationshipType relationType, String title) { imMessageClient.sendCustomMessage(CpRelationC2cNoticeUtils.buildInvitePending(sendUserId, acceptUserId, applyId, userProfile, acceptUserProfile, isReconcile, relationType, title)); - imMessageClient.sendCustomMessage(CpRelationC2cNoticeUtils.buildInvitePendingToSendUser( - sendUserId, acceptUserId, applyId, userProfile, acceptUserProfile, isReconcile, relationType, - title)); } private BigDecimal normalizeApplyConsumeGold(BigDecimal applyConsumeGold) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/cp/CpRelationC2cNoticeUtils.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/cp/CpRelationC2cNoticeUtils.java index 22e11280..75ec60e7 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/cp/CpRelationC2cNoticeUtils.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/cp/CpRelationC2cNoticeUtils.java @@ -29,13 +29,6 @@ public final class CpRelationC2cNoticeUtils { isReconcile, relationType, title); } - public static CustomC2cMsgBodyCmd buildInvitePendingToSendUser(Long sendUserId, Long acceptUserId, - Long applyId, UserProfileDTO senderProfile, UserProfileDTO acceptProfile, - boolean isReconcile, CpRelationshipType relationType, String title) { - return buildInvitePendingMessage(acceptUserId, sendUserId, applyId, senderProfile, - acceptProfile, isReconcile, relationType, title); - } - private static CustomC2cMsgBodyCmd buildInvitePendingMessage(Long fromUserId, Long toUserId, Long applyId, UserProfileDTO senderProfile, UserProfileDTO acceptProfile, boolean isReconcile, CpRelationshipType relationType, String title) { diff --git a/rc-service/rc-service-other/other-application/src/test/java/com/red/circle/other/app/command/user/SendCpApplyCmdExeTest.java b/rc-service/rc-service-other/other-application/src/test/java/com/red/circle/other/app/command/user/SendCpApplyCmdExeTest.java index b62eb2a1..46950f72 100644 --- a/rc-service/rc-service-other/other-application/src/test/java/com/red/circle/other/app/command/user/SendCpApplyCmdExeTest.java +++ b/rc-service/rc-service-other/other-application/src/test/java/com/red/circle/other/app/command/user/SendCpApplyCmdExeTest.java @@ -91,8 +91,10 @@ class SendCpApplyCmdExeTest { assertEquals("SISTERS", applies.get(2).getRelationType()); List messages = fixture.sentCustomMessages(3); - assertEquals("1001", messages.get(0).getFromAccount()); - assertEquals("2001", messages.get(0).getToAccount()); + messages.forEach(message -> { + assertEquals("1001", message.getFromAccount()); + assertEquals("2001", message.getToAccount()); + }); assertCpBuildMessage(messages.get(0), "CP", 3001L); assertCpBuildMessage(messages.get(1), "BROTHER", 3002L); assertCpBuildMessage(messages.get(2), "SISTERS", 3003L);