话题转移提 积分事件

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

@@ -333,10 +333,11 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             Result<List<UserBaseInfoResultDTO>> userResponse = userClient.queryUserBaseInfo(userParam);
             if(userResponse.success() && !CollectionUtils.isEmpty(userResponse.getData())){
                 UserBaseInfoResultDTO user = userResponse.getData().get(NumConstant.ZERO);
-                pointEventMsg.setRemark( new StringBuilder("邀请").append("加入")
+                pointEventMsg.setRemark( new StringBuilder("邀请")
                         .append(user.getStreet()).append("-").append(user.getSurname())
                         .append(StringUtils.equals(NumConstant.ONE_STR,user.getGender()) ? "先生" :
                                 StringUtils.equals(NumConstant.TWO_STR,user.getGender()) ? "女士" : "先生/女士")
+                        .append("加入")
                         .append(resiGroupDTO.getGroupName()).append("小组").toString());
             }
             pointEventMsgList.add(pointEventMsg);

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

@@ -545,10 +545,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			Result<List<UserBaseInfoResultDTO>> userResponse = userOpenFeignClient.queryUserBaseInfo(userParam);
 			if(userResponse.success() && !CollectionUtils.isEmpty(userResponse.getData())){
 				UserBaseInfoResultDTO user = userResponse.getData().get(NumConstant.ZERO);
-				pointEventMsg.setRemark( new StringBuilder("邀请").append("加入")
+				pointEventMsg.setRemark( new StringBuilder("邀请")
 						.append(user.getStreet()).append("-").append(user.getSurname())
 						.append(StringUtils.equals(NumConstant.ONE_STR,user.getGender()) ? "先生" :
 								StringUtils.equals(NumConstant.TWO_STR,user.getGender()) ? "女士" : "先生/女士")
+						.append("加入")
 						.append(resiGroupDTO.getGroupName()).append("小组").toString());
 			}
 

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

@@ -1580,8 +1580,43 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 }
 
                 //发送积分
+
+
+                //mq的事件类型
+                MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO();
+                mqBaseMsgDTO.setEventClass("resi_group");
+                //事件code
+                mqBaseMsgDTO.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+                List<BasePointEventMsg> pointEventMsgList = new ArrayList<>();
                 //1.话题被转为议题  组内成员
+                group.getTopicAuthorId();
+                BasePointEventMsg pointEventMsg = new BasePointEventMsg();
+                pointEventMsg.setCustomerId(groupCache.getCustomerId());
+                //pointEventMsg.setUserId(inviter);
+                pointEventMsg.setActionFlag(MqConstant.PLUS);
+                pointEventMsg.setIsCommon(false);
+                //pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime());
+                pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag());
+
+                pointEventMsgList.add(pointEventMsg);
+
                 //2.转话题为议题    组长
+                topicTurnIssueFromDTO.getUserId();
+
+
+                pointEventMsg.setCustomerId(groupCache.getCustomerId());
+                //pointEventMsg.setUserId(inviter);
+                pointEventMsg.setActionFlag(MqConstant.PLUS);
+                pointEventMsg.setIsCommon(false);
+                //pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime());
+                pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+
+                pointEventMsgList.add(pointEventMsg);
+
+                mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
+                if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){
+                    log.error("事件发送失败，参数：{}",JSON.toJSONString(topicTurnIssueFromDTO));
+                }
             }
             else {
                 ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class);