From 796613a959c3f2f663613c564f4a7085745abf46 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 26 Apr 2021 15:04:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=9A=E7=9F=A5=E5=95=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupServiceImpl.java    | 20 ++++-------
 .../impl/ResiGroupMemberServiceImpl.java      | 29 +++++++--------
 .../service/impl/ResiTopicServiceImpl.java    | 36 ++++++-------------
 .../service/impl/TopicDraftServiceImpl.java   | 23 ++++--------
 4 files changed, 35 insertions(+), 73 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index a630569ebb..fbbd94623b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -665,20 +665,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 
 		//发送小组成就消息
-		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
-			@Override
-			public void afterCommit() {
-				try {
-					boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
-							.sendGroupAchievementMqMsg(new GroupAchievementMQMsg(resiGroupDTO.getCustomerId(), resiGroupDTO.getId(), AchievementTypeEnum.MEMBER.getCode()));
-					if (!flag) {
-						logger.error("发送(小组成就)系统消息到message服务失败");
-					}
-				}catch (Exception e){
-					logger.error("afterCommit",e);
-				}
-			}
-		});
+		boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
+				.sendGroupAchievementMqMsg(new GroupAchievementMQMsg(resiGroupDTO.getCustomerId(), resiGroupDTO.getId(), AchievementTypeEnum.MEMBER.getCode()));
+		if (!flag) {
+			logger.error("发送(小组成就)系统消息到message服务失败");
+		}
+
 		return new Result();
 	}
 
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 18ccfbc2c8..c996173341 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
@@ -86,8 +86,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 
 import java.text.DateFormat;
@@ -623,6 +621,12 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			if(!result.success()){
 				logger.error((isNew ? "拉新用户入组事件发送失败" : "邀请已注册用户入组事件发送失败").concat("，参数：{}"),JSON.toJSONString(agreeApplyFormDTO));
 			}
+			//发送小组成就消息
+			boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
+					.sendGroupAchievementMqMsg(new GroupAchievementMQMsg(resiGroupDTO.getCustomerId(), resiGroupDTO.getId(), AchievementTypeEnum.MEMBER.getCode()));
+			if (!flag) {
+				logger.error("发送(小组成就)系统消息到message服务失败");
+			}
 		}
 	}
 
@@ -659,20 +663,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
 		msgList.add(wxSubscribeMessageFormDTO);
 		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
-		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
-			@Override
-			public void afterCommit() {
-				try {
-					//发送小组成就消息
-					boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(resiGroupMemberDTO.getCustomerId(), resiGroupMemberDTO.getResiGroupId(), AchievementTypeEnum.MEMBER.getCode()));
-					if (!flag) {
-						logger.error("发送(小组成就)系统消息到message服务失败");
-					}
-				}catch (Exception e){
-					logger.error("afterCommit",e);
-				}
-			}
-		});
+
+		//发送小组成就消息
+		boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(resiGroupMemberDTO.getCustomerId(), resiGroupMemberDTO.getResiGroupId(), 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 bda5e7ebe1..d35fb1268a 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
@@ -779,19 +779,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 log.error("组长解决话题事件发送失败，参数：{}",JSON.toJSONString(closeFormDTO));
             }
             //发送小组成就消息
-            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
-                @Override
-                public void afterCommit() {
-                    try {
-                        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(topic.getCustomerId(), topic.getGroupId(), AchievementTypeEnum.RESOVLE_TOPIC.getCode()));
-                        if (!flag) {
-                            log.error("发送(小组成就)系统消息到message服务失败");
-                        }
-                    }catch (Exception e){
-                        logger.error("afterCommit",e);
-                    }
-                }
-            });
+            boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(topic.getCustomerId(), topic.getGroupId(), AchievementTypeEnum.RESOVLE_TOPIC.getCode()));
+            if (!flag) {
+                log.error("发送(小组成就)系统消息到message服务失败");
+            }
+
         }
 
         return new Result();
@@ -1796,19 +1788,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     }
                 });
                 //发送小组成就消息
-                TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
-                    @Override
-                    public void afterCommit() {
-                        try {
-                            boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(group.getCustomerId(), group.getGroupId(), AchievementTypeEnum.TOISSUE.getCode()));
-                            if (!flag) {
-                                log.error("发送(小组成就)系统消息到message服务失败");
-                            }
-                        }catch (Exception e){
-                            logger.error("afterCommit",e);
-                        }
-                    }
-                });
+                boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(group.getCustomerId(), group.getGroupId(), AchievementTypeEnum.TOISSUE.getCode()));
+                if (!flag) {
+                    log.error("发送(小组成就)系统消息到message服务失败");
+                }
+
             } else {
                 ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class);
             }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 87e36f4c4d..15fbe39823 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -90,8 +90,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -983,21 +981,12 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         }
 
         //发送小组成就消息
-        //发送小组成就消息
-        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
-            @Override
-            public void afterCommit() {
-                try {
-                    boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
-                            .sendGroupAchievementMqMsg(new GroupAchievementMQMsg(customerId,groupId,AchievementTypeEnum.TOPIC.getCode()));
-                    if (!flag) {
-                        log.error("发送(小组成就)系统消息到message服务失败");
-                    }
-                }catch (Exception e){
-                    logger.error("afterCommit",e);
-                }
-            }
-        });
+        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
+                .sendGroupAchievementMqMsg(new GroupAchievementMQMsg(customerId, groupId, AchievementTypeEnum.TOPIC.getCode()));
+        if (!flag) {
+            log.error("发送(小组成就)系统消息到message服务失败");
+        }
+
     }