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

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java

@@ -42,7 +42,7 @@ public class SendMqMsgUtil {
      * @return boolean
      * @author LiuJanJun
      * @date 2021/4/23 3:01 下午
-     * @remark 失败重试1次
+     * @remark 失败重试1次,调用端自行判断如果失败是否要继续执行
      */
     public boolean sendGroupAchievementMqMsg(GroupAchievementMQMsg msgContent) {
         try {

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

@@ -111,6 +111,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
         if(currentValue == 0){
             return true;
         }
+        log.info("calculateAcm achievementType:{},groupId:{},currentValue:{}",groupId,currentValue,achievementType);
         calculateGroupAchievement(customerId, groupId, currentValue, achievementType);
         return true;
     }

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

@@ -1635,6 +1635,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @date 2020.11.20 10:26
      */
     @Override
+    @Transactional
     public FirstTopicShiftedToIssueApplicationResultDTO shiftIssueV2(ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO) {