Merge remote-tracking branch 'origin/feature-chat-activity' into feature-chat-activity

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatActivityDataController.java

@@ -208,6 +208,9 @@ public class GroupChatActivityDataController {
         task.setUser(loginUser);
         task.setTotalCount(joinDetail(inviterDetailReq).getResult().getTotalCount());
 
+        //查询奖励配置
+        GroupChatActivityDTO groupChatActivityDTO = getActivityDetail(inviterDetailReq.getEnterpriseId(), Long.parseLong(inviterDetailReq.getChatActivityId()));
+
         List<String> fieldList = new ArrayList<>();
         List<String> indexList = new ArrayList<>();
         fieldList.add("name");
@@ -240,8 +243,8 @@ public class GroupChatActivityDataController {
         fieldList.add("");
         indexList.add("奖励卡券数");
 
-        task.setFileName("社群邀请有礼-活动名称-参与客户");
-        task.setChannelName("社群邀请有礼-活动名称-参与客户");
+        task.setFileName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-参与客户");
+        task.setChannelName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-参与客户");
         task.setBucketName(BucketNameEnum.REPORT_50000.getName());
 
         jsonObject.put("indexList", indexList);
@@ -311,6 +314,10 @@ public class GroupChatActivityDataController {
         task.setUser(loginUser);
         task.setTotalCount(inviterDetail(inviteLogQDTO).getResult().getTotalCount());
 
+        //查询奖励配置
+        GroupChatActivityDTO groupChatActivityDTO = getActivityDetail(inviteLogQDTO.getEnterpriseId(), inviteLogQDTO.getChatActivityId());
+
+
         List<String> fieldList = new ArrayList<>();
         List<String> indexList = new ArrayList<>();
         fieldList.add("name");
@@ -349,8 +356,8 @@ public class GroupChatActivityDataController {
         fieldList.add("joinGroupChatTime");
         indexList.add("入群时间");
 
-        task.setFileName("社群邀请有礼-活动名称-邀请明细");
-        task.setChannelName("社群邀请有礼-活动名称-邀请明细");
+        task.setFileName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-邀请明细");
+        task.setChannelName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-邀请明细");
         task.setBucketName(BucketNameEnum.REPORT_50000.getName());
 
         jsonObject.put("indexList", indexList);
@@ -421,9 +428,7 @@ public class GroupChatActivityDataController {
         task.setTotalCount(rewardDetail(rewardLogReq).getResult().getTotalCount());
 
         //查询奖励配置
-        ServiceResponse<GroupChatActivityDTO> serviceActivityDetail = groupChatActivityApiService
-                .getActivityDetail(rewardLogReq.getEnterpriseId(), rewardLogReq.getChatActivityId());
-        GroupChatActivityDTO groupChatActivityDTO = serviceActivityDetail.getResult();
+        GroupChatActivityDTO groupChatActivityDTO = getActivityDetail(rewardLogReq.getEnterpriseId(), rewardLogReq.getChatActivityId());
 
         //获取所有奖励类型
         Set<Integer> rewardTypeList = Sets.newHashSet();
@@ -473,8 +478,8 @@ public class GroupChatActivityDataController {
         fieldList.add("createTime");
         indexList.add("发放时间");
 
-        task.setFileName("社群邀请有礼-活动名称-奖励明细");
-        task.setChannelName("社群邀请有礼-活动名称-奖励明细");
+        task.setFileName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-奖励明细");
+        task.setChannelName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-奖励明细");
         task.setBucketName(BucketNameEnum.REPORT_50000.getName());
 
         jsonObject.put("indexList", indexList);
@@ -617,4 +622,10 @@ public class GroupChatActivityDataController {
         return memberDTOMap;
 
     }
+
+    private GroupChatActivityDTO getActivityDetail(String enterpriseId, Long chatActivityId) {
+        ServiceResponse<GroupChatActivityDTO> serviceActivityDetail = groupChatActivityApiService
+                .getActivityDetail(enterpriseId, chatActivityId);
+        return serviceActivityDetail.getResult();
+    }
 }