Merge branch 'feature-chat-activity' into 'developer'

Feature chat activity

See merge request !2241

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

@@ -329,14 +329,14 @@ public class GroupChatActivityInviteLogServiceImpl implements GroupChatActivityI
             int maxInviteNumber = rewardDTOList.stream().mapToInt(GroupChatActivityRewardDTO::getInviteNumber).max().getAsInt();
             for (GroupChatActivityRewardDTO rewardDTO : rewardDTOList) {
                 Integer inviteNumber = rewardDTO.getInviteNumber();
-                if (inviteNumber == maxInviteNumber) {
+                if (inviteNumber >= maxInviteNumber) {
                     if (count.intValue() > maxInviteNumber) {
                         batchNumber = -1;
                     } else if (count.intValue() == maxInviteNumber) {
                         batchNumber = rewardDTO.getInviteLevel();
                     }
                     break;
-                } else if (count.intValue() > inviteNumber) {
+                } else if (count.intValue() >= inviteNumber) {
                     batchNumber = rewardDTO.getInviteLevel();
                 }
             }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/handle/GroupChatActivityRewardHandle.java

@@ -55,10 +55,10 @@ public class GroupChatActivityRewardHandle extends DownloadHandlerAbstract<Group
             BeanUtils.copyProperties(groupChatActivityRewardLogVO, groupChatActivityRewardLogExportVO);
 
             if (groupChatActivityRewardLogVO.getRewardInvite() == 1) {
-                groupChatActivityRewardLogExportVO.setInviteLevelType("邀请奖励");
+                groupChatActivityRewardLogExportVO.setRewardInviteType("邀请奖励");
                 groupChatActivityRewardLogExportVO.setInviteLevelType("达成第" + groupChatActivityRewardLogVO.getInviteLevel() + "阶梯邀请奖励");
             } else {
-                groupChatActivityRewardLogExportVO.setInviteLevelType("受邀奖励");
+                groupChatActivityRewardLogExportVO.setRewardInviteType("受邀奖励");
                 groupChatActivityRewardLogExportVO.setInviteLevelType("受邀进群奖励");
             }