From 2163783534c0e840eb134e445eb9d5e580ad617d Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 26 Apr 2021 15:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E9=94=99=E4=BD=8D=E7=BD=AE=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

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 d35fb1268a..820ad13298 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
@@ -111,8 +111,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 org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
@@ -778,14 +776,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){
                 log.error("组长解决话题事件发送失败，参数：{}",JSON.toJSONString(closeFormDTO));
             }
-            //发送小组成就消息
-            boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(topic.getCustomerId(), topic.getGroupId(), AchievementTypeEnum.RESOVLE_TOPIC.getCode()));
-            if (!flag) {
-                log.error("发送(小组成就)系统消息到message服务失败");
-            }
-
         }
-
+        //发送小组成就消息
+        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();
     }
 
@@ -1787,12 +1783,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                         log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(topicTurnIssueFromDTO));
                     }
                 });
-                //发送小组成就消息
-                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);
             }
@@ -1800,7 +1790,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         }else {
             throw new RenException(dataFilterResult.getMsg());
         }
-
+        //发送小组成就消息
+        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(group.getCustomerId(), group.getGroupId(), AchievementTypeEnum.TOISSUE.getCode()));
+        if (!flag) {
+            log.error("发送(小组成就)系统消息到message服务失败");
+        }
         return result;
 
     }