Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

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);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -699,7 +699,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服务失败");
 		}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -811,8 +811,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             groupMessageDao.updateById(groupMessage);
         }
         //2021.4.22 end sun
-        // 发送小组成就消息
-        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服务失败");
         }
@@ -1825,7 +1826,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服务失败");
         }

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;