From a101855d1f7777876768ac539ac10e17e6120fc5 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 27 Apr 2021 09:43:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/send/SendMqMsgUtil.java         | 1 +
 .../member/service/impl/ResiGroupMemberServiceImpl.java     | 3 ++-
 .../modules/topic/service/impl/ResiTopicServiceImpl.java    | 6 ++++--
 .../com/epmet/mq/type1/GroupAchievementCustomListener.java  | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
index 1880cb8bac..b0614dc818 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
@@ -50,6 +50,7 @@ public class SendMqMsgUtil {
             systemMsgFormDTO.setMessageType(SystemMessageType.GROUP_ACHIEVEMENT);
             systemMsgFormDTO.setContent(msgContent);
             Result sendMsgResult = null;
+            log.info("sendGroupAchievementMqMsg param:{}",msgContent);
             int retryTime = 0;
             do {
                 sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(systemMsgFormDTO);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index a51eb76df9..0c00173278 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -665,7 +665,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 
 		//发送小组成就消息
-		boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(resiGroupMemberDTO.getCustomerId(), resiGroupMemberDTO.getResiGroupId(), AchievementTypeEnum.MEMBER.getCode()));
+		boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
+				.sendGroupAchievementMqMsg(new GroupAchievementMQMsg(resiGroupDTO.getCustomerId(), resiGroupDTO.getId(), AchievementTypeEnum.MEMBER.getCode()));
 		if (!flag) {
 			logger.error("发送(小组成就)系统消息到message服务失败");
 		}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 820ad13298..5d7d721b7a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -778,7 +778,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             }
         }
         //发送小组成就消息
-        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(topic.getCustomerId(), topic.getGroupId(), AchievementTypeEnum.RESOVLE_TOPIC.getCode()));
+        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
+                .sendGroupAchievementMqMsg(new GroupAchievementMQMsg(topic.getCustomerId(), topic.getGroupId(), AchievementTypeEnum.RESOVLE_TOPIC.getCode()));
         if (!flag) {
             log.error("发送(小组成就)系统消息到message服务失败");
         }
@@ -1791,7 +1792,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             throw new RenException(dataFilterResult.getMsg());
         }
         //发送小组成就消息
-        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(group.getCustomerId(), group.getGroupId(), AchievementTypeEnum.TOISSUE.getCode()));
+        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
+                .sendGroupAchievementMqMsg(new GroupAchievementMQMsg(group.getCustomerId(), group.getGroupId(), AchievementTypeEnum.TOISSUE.getCode()));
         if (!flag) {
             log.error("发送(小组成就)系统消息到message服务失败");
         }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/GroupAchievementCustomListener.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/GroupAchievementCustomListener.java
index af9624d5ca..6ac31acef6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/GroupAchievementCustomListener.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/GroupAchievementCustomListener.java
@@ -40,8 +40,8 @@ public class GroupAchievementCustomListener implements MessageListenerConcurrent
     }
 
     private void consumeMessage(MessageExt messageExt) {
+        logger.info("receive msg:{}", JSON.toJSONString(messageExt));
         String msg = new String(messageExt.getBody());
-        logger.info("receive msg:{}", JSON.toJSONString(msg));
         GroupAchievementMQMsg msgObj = JSON.parseObject(msg, GroupAchievementMQMsg.class);
 
         DistributedLock distributedLock = null;