社群判断是否有效过滤

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatActivityInviteLogServiceImpl.java

@@ -179,7 +179,7 @@ public class GroupChatActivityInviteLogServiceImpl implements GroupChatActivityI
             Integer inviteType = Constant.FLAG_FALSE;
             int batchNumber = -1;
             Integer invalidInviteType = getActivityEffective(context);
-            logger.info("获取本次入群有效状态:{}", invalidInviteType);
+            logger.info("获取本次入群有效状态:{},{}", invalidInviteType,ChatActivityInvalidInviteTypeEnum.getDescByValue(invalidInviteType));
             if (invalidInviteType == null) {
                 inviteType = Constant.FLAG_TRUE;
                 //获取奖励批次
@@ -271,7 +271,9 @@ public class GroupChatActivityInviteLogServiceImpl implements GroupChatActivityI
     private Integer getActivityEffective(GroupChatActivityContext context) {
         GroupChatActivityDTO activity = context.getChatActivityDTO();
         String enterpriseId = activity.getEnterpriseId();
-        String userId = context.getChatUser().getUserId();
+        TabGroupChatUser chatUser = context.getChatUser();
+        String userId = chatUser.getUserId();
+        Long chatUserId = chatUser.getChatUserId();
         Long chatActivityId = context.getChatActivityId();
         Integer inviteType = activity.getInviteType();
         TabGroupChatActivityInviteLog inviteLog = new TabGroupChatActivityInviteLog();
@@ -285,13 +287,19 @@ public class GroupChatActivityInviteLogServiceImpl implements GroupChatActivityI
         if (Objects.equals(ChatActivityInviteTypeEnum.NONE_GROUP_CHAT.value, inviteType)) {
             List<TabGroupChatUser> chatUserList = groupChatUserMapper.listByUserId(enterpriseId, userId, 1);
             if (CollectionUtils.isNotEmpty(chatUserList)) {
-                return ChatActivityInvalidInviteTypeEnum.TWO.value;
+                TabGroupChatUser groupChatUser = chatUserList.get(0);
+                if (!Objects.equals(groupChatUser.getChatUserId(),chatUserId)) {
+                    return ChatActivityInvalidInviteTypeEnum.TWO.value;
+                }
             }
         }
         if (Objects.equals(ChatActivityInviteTypeEnum.FIRST_GROUP_CHAT.value, inviteType)) {
             List<TabGroupChatUser> chatUserList2 = groupChatUserMapper.listByUserId(enterpriseId, userId, null);
             if (CollectionUtils.isNotEmpty(chatUserList2)) {
-                return ChatActivityInvalidInviteTypeEnum.THREE.value;
+                TabGroupChatUser groupChatUser = chatUserList2.get(0);
+                if (!Objects.equals(groupChatUser.getChatUserId(),chatUserId)) {
+                    return ChatActivityInvalidInviteTypeEnum.THREE.value;
+                }
             }
         }
         return null;

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatUserMapper.xml

@@ -216,6 +216,7 @@
 			and status_flag = #{statusFlag}
 		</if>
 		and delete_flag = 0
+		order by join_time asc,chat_user_id asc
 	</select>
 
 	<select id="listByExternalUseridForMatch" resultMap="result-map-tabHaobanGroupChatUser">