参与客户

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

@@ -175,12 +175,30 @@ public class GroupChatActivityDataController {
     @RequestMapping("join_detail")
     @ResponseBody
     public RestResponse<Page<GroupChatDataJoinDetailVO>> joinDetail(@RequestBody GroupChatActivityJoinDetailReq inviterDetailReq) {
-        WebLoginDTO user = AuthWebRequestUtil.getLoginUser();
-        inviterDetailReq.setEnterpriseId(user.getEnterpriseId());
+        if (StringUtils.isEmpty(inviterDetailReq.getEnterpriseId())) {
+            WebLoginDTO user = AuthWebRequestUtil.getLoginUser();
+            inviterDetailReq.setEnterpriseId(user.getEnterpriseId());
+        }
+
         Map<String, Object> res = DataApiUtils.http(JSON.toJSONString(inviterDetailReq), StatisticsApolloKeyConstant.data_mkt_group_chat_data_inviter_detail);
         Page page = DataApiUtils.getPageData(res);
         if (CollectionUtils.isNotEmpty(page.getResult())) {
             List<GroupChatDataJoinDetailVO> groupChatDataJoinDetailVOS = JSON.parseArray(JSON.toJSONString(page.getResult()), GroupChatDataJoinDetailVO.class);
+            List<String> memberIdList = groupChatDataJoinDetailVOS.stream().map(GroupChatDataJoinDetailVO::getInviterMemberId).collect(Collectors.toList());
+            Map<String, MemberDTO> memberDTOMap = queryMemberByMemberIdList(memberIdList);
+
+            groupChatDataJoinDetailVOS.forEach(groupChatDataJoinDetailVO -> {
+                MemberDTO memberDTO = memberDTOMap.get(groupChatDataJoinDetailVO.getInviterMemberId());
+                if (Objects.nonNull(memberDTO)) {
+                    groupChatDataJoinDetailVO.setName(memberDTO.getMemberName());
+                    groupChatDataJoinDetailVO.setNickName(memberDTO.getThirdNickname());
+                    groupChatDataJoinDetailVO.setPhoneNumber(memberDTO.getPhoneNumber());
+                    groupChatDataJoinDetailVO.setMemberDeleteFlag(0);
+                } else {
+                    groupChatDataJoinDetailVO.setMemberDeleteFlag(1);
+                }
+            });
+
             page.setResult(groupChatDataJoinDetailVOS);
         }
         return RestResponse.successResult(page);
@@ -225,22 +243,22 @@ public class GroupChatActivityDataController {
         fieldList.add("inviteeName");
         indexList.add("受邀人姓名");
 
-        fieldList.add("");
+        fieldList.add("inviteeNum");
         indexList.add("邀请进群人数");
 
-        fieldList.add("");
+        fieldList.add("effectiveInviteeNum");
         indexList.add("有效进群人数");
 
-        fieldList.add("");
+        fieldList.add("newMemberNum");
         indexList.add("新增会员数");
 
-        fieldList.add("");
+        fieldList.add("integralCnt");
         indexList.add("奖励积分");
 
-        fieldList.add("");
+        fieldList.add("growCnt");
         indexList.add("奖励成长值");
 
-        fieldList.add("");
+        fieldList.add("cardCnt");
         indexList.add("奖励卡券数");
 
         task.setFileName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-参与客户");

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

@@ -8,6 +8,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.security.DownloadReportDTO;
 import com.gic.haoban.manage.web.controller.chat.GroupChatActivityDataController;
 import com.gic.haoban.manage.web.qo.chat.GroupChatActivityInviteLogReq;
+import com.gic.haoban.manage.web.qo.chat.GroupChatActivityJoinDetailReq;
 import com.gic.haoban.manage.web.qo.chat.GroupChatActivityRewardLogReq;
 import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteLogVO;
 import com.gic.haoban.manage.web.vo.chat.GroupChatActivityRewardLogExportVO;
@@ -40,23 +41,19 @@ public class GroupChatActivityJoinHandle extends DownloadHandlerAbstract<GroupCh
 
     @Override
     public List<GroupChatDataJoinDetailVO> getData(Context context, String searchDataParams, Integer currentPage) {
-        GroupChatActivityInviteLogReq inviteLogReq = JSON.parseObject(searchDataParams, GroupChatActivityInviteLogReq.class);
-        inviteLogReq.setPageNum(currentPage);
-        inviteLogReq.setPageSize(getPageSize());
-        log.info("社群邀请有礼参与客户数据导出，请求参数={}", JSON.toJSONString(inviteLogReq));
-        RestResponse<Page<GroupChatActivityInviteLogVO>> dataPageVORestResponse = groupChatActivityDataController.inviterDetail(inviteLogReq);
-        List<GroupChatActivityInviteLogVO> groupChatActivityInviteLogVOS = dataPageVORestResponse.getResult().getResult();
-        if (CollectionUtils.isEmpty(groupChatActivityInviteLogVOS)) {
+        GroupChatActivityJoinDetailReq joinDetailReq = JSON.parseObject(searchDataParams, GroupChatActivityJoinDetailReq.class);
+        joinDetailReq.setPageNum(currentPage);
+        joinDetailReq.setPageSize(getPageSize());
+        log.info("社群邀请有礼参与客户数据导出，请求参数={}", JSON.toJSONString(joinDetailReq));
+        RestResponse<Page<GroupChatDataJoinDetailVO>> dataPageVORestResponse = groupChatActivityDataController.joinDetail(joinDetailReq);
+        List<GroupChatDataJoinDetailVO> groupChatDataJoinDetailVOS = dataPageVORestResponse.getResult().getResult();
+        if (CollectionUtils.isEmpty(groupChatDataJoinDetailVOS)) {
             return Lists.newArrayList();
         }
-        List<GroupChatDataJoinDetailVO> groupChatDataJoinDetailVOS = Lists.newArrayList();
-        for (GroupChatActivityInviteLogVO groupChatActivityInviteLogVO : groupChatActivityInviteLogVOS) {
-            GroupChatActivityRewardLogExportVO groupChatActivityRewardLogExportVO = new GroupChatActivityRewardLogExportVO();
-            BeanUtils.copyProperties(groupChatActivityInviteLogVO, groupChatActivityRewardLogExportVO);
-
-
-
-
+        for (GroupChatDataJoinDetailVO groupChatDataJoinDetailVO : groupChatDataJoinDetailVOS) {
+           if(groupChatDataJoinDetailVO.getMemberDeleteFlag() == 1){
+               groupChatDataJoinDetailVO.setName("账号已注销");
+           }
         }
         log.info("社群邀请有礼参与客户数据导出={}", JSON.toJSONString(groupChatDataJoinDetailVOS));
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityInviteLogVO.java

@@ -10,6 +10,7 @@ import java.util.Date;
 public class GroupChatActivityInviteLogVO implements Serializable {
 
     private static final long serialVersionUID = -7144700091431890994L;
+
     /**
      * 会员名称
      */

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatDataJoinDetailVO.java

@@ -16,49 +16,181 @@ public class GroupChatDataJoinDetailVO implements Serializable {
     private String chatActivityId;
 
     /**
+     * 会员名称
+     */
+    private String name;
+
+    /**
+     * 会员手机
+     */
+    private String phoneNumber;
+
+    /**
+     * 会员别名昵称
+     */
+    private String nickName;
+
+    /**
+     * 会员是否删除
+     * 0 正常
+     * 1 已删除
+     */
+    private Integer memberDeleteFlag;
+
+    /**
      * 邀请进群人数
      */
-    private String inviteeNum;
+    private Integer inviteeNum;
 
     /**
      * 有效邀请人数
      */
-    private String effectiveInviteeNum;
+    private Integer effectiveInviteeNum;
 
     /**
      * 入群客户数
      */
-    private String inviteeMemberNum;
+    private Integer inviteeMemberNum;
 
     /**
      * 入群游客数
      */
-    private String inviteeNonMemberNum;
+    private Integer inviteeNonMemberNum;
 
     /**
      * 新增会员数
      */
-    private String newMemberNum;
+    private Integer newMemberNum;
 
     /**
      * 发放积分数
      */
-    private String integralCnt;
+    private Integer integralCnt;
 
     /**
      * 发放成长值数
      */
-    private String growCnt;
+    private Integer growCnt;
 
     /**
      * 发放卡券数
      */
-    private String cardCnt;
+    private Integer cardCnt;
 
     /**
      * 参与会员id
      */
     private String inviterMemberId;
 
+    public String getChatActivityId() {
+        return chatActivityId;
+    }
+
+    public void setChatActivityId(String chatActivityId) {
+        this.chatActivityId = chatActivityId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public Integer getMemberDeleteFlag() {
+        return memberDeleteFlag;
+    }
+
+    public void setMemberDeleteFlag(Integer memberDeleteFlag) {
+        this.memberDeleteFlag = memberDeleteFlag;
+    }
+
+    public Integer getInviteeNum() {
+        return inviteeNum;
+    }
+
+    public void setInviteeNum(Integer inviteeNum) {
+        this.inviteeNum = inviteeNum;
+    }
+
+    public Integer getEffectiveInviteeNum() {
+        return effectiveInviteeNum;
+    }
+
+    public void setEffectiveInviteeNum(Integer effectiveInviteeNum) {
+        this.effectiveInviteeNum = effectiveInviteeNum;
+    }
+
+    public Integer getInviteeMemberNum() {
+        return inviteeMemberNum;
+    }
+
+    public void setInviteeMemberNum(Integer inviteeMemberNum) {
+        this.inviteeMemberNum = inviteeMemberNum;
+    }
+
+    public Integer getInviteeNonMemberNum() {
+        return inviteeNonMemberNum;
+    }
+
+    public void setInviteeNonMemberNum(Integer inviteeNonMemberNum) {
+        this.inviteeNonMemberNum = inviteeNonMemberNum;
+    }
+
+    public Integer getNewMemberNum() {
+        return newMemberNum;
+    }
+
+    public void setNewMemberNum(Integer newMemberNum) {
+        this.newMemberNum = newMemberNum;
+    }
+
+    public Integer getIntegralCnt() {
+        return integralCnt;
+    }
+
+    public void setIntegralCnt(Integer integralCnt) {
+        this.integralCnt = integralCnt;
+    }
+
+    public Integer getGrowCnt() {
+        return growCnt;
+    }
+
+    public void setGrowCnt(Integer growCnt) {
+        this.growCnt = growCnt;
+    }
+
+    public Integer getCardCnt() {
+        return cardCnt;
+    }
+
+    public void setCardCnt(Integer cardCnt) {
+        this.cardCnt = cardCnt;
+    }
+
+    public String getInviterMemberId() {
+        return inviterMemberId;
+    }
 
+    public void setInviterMemberId(String inviterMemberId) {
+        this.inviterMemberId = inviterMemberId;
+    }
 }