Commit b823ed05 by 徐高华

企微托管

parent a994e06e
...@@ -16,25 +16,31 @@ import com.gic.haoban.manage.web.qo.open.AddTaskDataQO; ...@@ -16,25 +16,31 @@ import com.gic.haoban.manage.web.qo.open.AddTaskDataQO;
import com.gic.haoban.manage.web.qo.open.AddTaskMemberPageQO; import com.gic.haoban.manage.web.qo.open.AddTaskMemberPageQO;
import com.gic.haoban.manage.web.qo.open.AddTaskPageQO; import com.gic.haoban.manage.web.qo.open.AddTaskPageQO;
import com.gic.haoban.manage.web.utils.CreatorUtils; import com.gic.haoban.manage.web.utils.CreatorUtils;
import com.gic.haoban.manage.web.vo.MemberTagGroupVO;
import com.gic.haoban.manage.web.vo.open.AddTaskDetailVO; import com.gic.haoban.manage.web.vo.open.AddTaskDetailVO;
import com.gic.haoban.task.manage.api.dto.open.*; import com.gic.haoban.task.manage.api.dto.open.*;
import com.gic.haoban.task.manage.api.qdto.open.AddTaskMemberPageQDTO; import com.gic.haoban.task.manage.api.qdto.open.AddTaskMemberPageQDTO;
import com.gic.haoban.task.manage.api.qdto.open.QwAddTaskPageQDTO; import com.gic.haoban.task.manage.api.qdto.open.QwAddTaskPageQDTO;
import com.gic.haoban.task.manage.api.service.OpenQwApiService; import com.gic.haoban.task.manage.api.service.OpenQwApiService;
import com.gic.member.tag.api.dto.MemberTagDTO; import com.gic.member.tag.api.dto.MemberTagDTO;
import com.gic.member.tag.api.dto.MemberTagGroupDTO;
import com.gic.member.tag.api.dto.MemberTagItemDTO; import com.gic.member.tag.api.dto.MemberTagItemDTO;
import com.gic.member.tag.api.service.MemberTagApiService; import com.gic.member.tag.api.service.MemberTagApiService;
import com.gic.member.tag.api.service.MemberTagGroupApiService;
import com.gic.qcloud.BucketNameEnum; import com.gic.qcloud.BucketNameEnum;
import com.gic.web.common.download.DownloadTask; import com.gic.web.common.download.DownloadTask;
import com.gic.web.common.download.DownloadTaskUtil; import com.gic.web.common.download.DownloadTaskUtil;
import com.gic.web.common.download.constants.TaskTypeEnum; import com.gic.web.common.download.constants.TaskTypeEnum;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -51,6 +57,8 @@ public class QywxOpenTaskController { ...@@ -51,6 +57,8 @@ public class QywxOpenTaskController {
private OpenAddMemberExcelHandler openAddMemberExcelHandler; private OpenAddMemberExcelHandler openAddMemberExcelHandler;
@Autowired @Autowired
private MemberTagApiService memberTagApiService; private MemberTagApiService memberTagApiService;
@Autowired
private MemberTagGroupApiService memberTagGroupApiService;
/** /**
* 加好友任务列表 * 加好友任务列表
...@@ -120,9 +128,41 @@ public class QywxOpenTaskController { ...@@ -120,9 +128,41 @@ public class QywxOpenTaskController {
vo.setMemberLabelStatus(tagItem.getStatus()); vo.setMemberLabelStatus(tagItem.getStatus());
} }
} }
// 会员分组
if (vo.getMemberType() == 1) {
List<MemberTagGroupVO> memberTagGroupVOS = this.listMemberTagGroupInfoByGoupIds(vo
.getSearchParams());
vo.setTagGroupList(memberTagGroupVOS);
}
return RestResponse.successResult(vo); return RestResponse.successResult(vo);
} }
public List<MemberTagGroupVO> listMemberTagGroupInfoByGoupIds(String tagGroupIds) {
List<MemberTagGroupVO> result = new ArrayList<>();
if (StringUtils.isBlank(tagGroupIds)) {
return result;
}
String[] tagGroupIdArr = tagGroupIds.split(",");
if (ArrayUtils.isEmpty(tagGroupIdArr)) {
return result;
}
List<MemberTagGroupDTO> memberTagGroupDTOList = memberTagGroupApiService.findListByIds(
new ArrayList<>(Arrays.asList(tagGroupIdArr)));
if (CollectionUtils.isNotEmpty(memberTagGroupDTOList)) {
for (MemberTagGroupDTO memberTagGroupDTO : memberTagGroupDTOList) {
MemberTagGroupVO memberTagGroupVO = new MemberTagGroupVO();
memberTagGroupVO.setGroupName(memberTagGroupDTO.getGroupName());
memberTagGroupVO.setMemberTagGroupId(memberTagGroupDTO.getMemberTagGroupId());
memberTagGroupVO.setEffectiveStatus(memberTagGroupDTO.getEffectiveStatus());
memberTagGroupVO.setIsRealTime(memberTagGroupDTO.getIsRealTime());
memberTagGroupVO.setFixedType(memberTagGroupDTO.getFixedType());
result.add(memberTagGroupVO);
}
}
return result;
}
/** /**
* 终止加好友任务 * 终止加好友任务
* *
......
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
/**
* 会员分组信息VO
* @Author: FangXu
* @Date: 2018/12/17 13:55
* @Version 1.0
*/
public class MemberTagGroupVO implements Serializable {
/**
*
*/
private static final long serialVersionUID = 6813792225053490935L;
/** 分组名称 **/
private String groupName;
/** 分组ID **/
private String memberTagGroupId;
/** 分组有效状态 **/
private Integer effectiveStatus;
/** 失效状态: 实时, 非实时 **/
private Integer isRealTime;
/**
* 0普通分组 1固化分组
*/
private Integer fixedType;
public Integer getFixedType() {
return fixedType;
}
public void setFixedType(Integer fixedType) {
this.fixedType = fixedType;
}
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public String getMemberTagGroupId() {
return memberTagGroupId;
}
public void setMemberTagGroupId(String memberTagGroupId) {
this.memberTagGroupId = memberTagGroupId;
}
public Integer getEffectiveStatus() {
return effectiveStatus;
}
public void setEffectiveStatus(Integer effectiveStatus) {
this.effectiveStatus = effectiveStatus;
}
public Integer getIsRealTime() {
return isRealTime;
}
public void setIsRealTime(Integer isRealTime) {
this.isRealTime = isRealTime;
}
}
package com.gic.haoban.manage.web.vo.open; package com.gic.haoban.manage.web.vo.open;
import com.gic.haoban.manage.web.vo.MemberTagGroupVO;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
public class AddTaskDetailVO implements Serializable { public class AddTaskDetailVO implements Serializable {
...@@ -46,6 +49,16 @@ public class AddTaskDetailVO implements Serializable { ...@@ -46,6 +49,16 @@ public class AddTaskDetailVO implements Serializable {
/** 人群id用于回显 */ /** 人群id用于回显 */
private String searchParamsId ; private String searchParamsId ;
private List<MemberTagGroupVO> tagGroupList;
public List<MemberTagGroupVO> getTagGroupList() {
return tagGroupList;
}
public void setTagGroupList(List<MemberTagGroupVO> tagGroupList) {
this.tagGroupList = tagGroupList;
}
public String getSearchParamsId() { public String getSearchParamsId() {
return searchParamsId; return searchParamsId;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment