Skip to content

H
haoban-manage3.0
Commit 33dfc25e by 王祖波
Options

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

parents 0eb40efc baaf90a7
Showing with 1503 additions and 106 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/chat/GroupChatActivityInviteLogQDTO.java
......@@ -4,6 +4,7 @@ import com.gic.api.base.commons.BasePageInfo;
import com.gic.commons.web.qo.PageQo;
import java.io.Serializable;
import java.util.Date;
/**
* @author shangfeng
......@@ -26,16 +27,36 @@ public class GroupChatActivityInviteLogQDTO extends BasePageInfo implements Seri
private String inviterMemberId;
/**
* 受邀请人会员ID
*/
private String inviteeMemberId;
/**
* 有效邀请类型 1有效0无效
*/
private Integer inviteType;
/**
* 是否新增会员 1是 0否 null未统计
*/
private Integer addMemberType;
/**
* 批次
*/
private Integer batchNumber;
/**
* 开始时间
*/
private Date beginTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 排序字段
*/
private String sortFiled;
......@@ -77,6 +98,38 @@ public class GroupChatActivityInviteLogQDTO extends BasePageInfo implements Seri
this.inviteType = inviteType;
}
public String getInviteeMemberId() {
return inviteeMemberId;
}
public void setInviteeMemberId(String inviteeMemberId) {
this.inviteeMemberId = inviteeMemberId;
}
public Integer getAddMemberType() {
return addMemberType;
}
public void setAddMemberType(Integer addMemberType) {
this.addMemberType = addMemberType;
}
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Integer getBatchNumber() {
return batchNumber;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/chat/GroupChatActivityRewardLogQDTO.java
......@@ -3,6 +3,7 @@ package com.gic.haoban.manage.api.qdto.chat;
import com.gic.api.base.commons.BasePageInfo;
import java.io.Serializable;
import java.util.Date;
/**
* @author shangfeng
......@@ -23,6 +24,21 @@ public class GroupChatActivityRewardLogQDTO extends BasePageInfo implements Seri
*/
private String memberId;
/**
* 奖励人类型 1邀请人2受邀人
*/
private Integer rewardInvite;
/**
* 开始时间
*/
private Date beginTime;
/**
* 结束时间
*/
private Date endTime;
public String getEnterpriseId() {
return enterpriseId;
}
......@@ -46,4 +62,28 @@ public class GroupChatActivityRewardLogQDTO extends BasePageInfo implements Seri
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public Integer getRewardInvite() {
return rewardInvite;
}
public void setRewardInvite(Integer rewardInvite) {
this.rewardInvite = rewardInvite;
}
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
}
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatActivityInviteLogMapper.xml
......@@ -188,6 +188,18 @@
<if test="inviteType != null">
and invite_type = #{inviteType}
</if>
<if test="addMemberType != null">
and add_member_type = #{addMemberType}
</if>
<if test="inviteType != null">
and invite_type = #{inviteType}
</if>
<if test="beginTime != null">
and create_time gt #{beginTime}
</if>
<if test="inviteType != null">
and create_time lt #{endTime}
</if>
<if test="sortFiled != null">
order by #{sortFiled} #{sortType}
</if>
......
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatActivityRewardLogMapper.xml
......@@ -163,6 +163,15 @@
<if test="memberId != null and memberId != ''">
and member_id = #{memberId}
</if>
<if test="rewardInvite != null">
and reward_invite = #{rewardInvite}
</if>
<if test="beginTime != null">
and create_time gt #{beginTime}
</if>
<if test="inviteType != null">
and create_time lt #{endTime}
</if>
order by create_time desc
</select>
</mapper>
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/handle/GroupChatActivityInviterHandle.java
package com.gic.haoban.manage.web.handle;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityRewardDetailVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatChatDetailVO;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.api.dto.security.DownloadReportDTO;
import com.gic.haoban.manage.api.enums.chat.ChatActivityInvalidInviteTypeEnum;
import com.gic.haoban.manage.web.controller.chat.GroupChatActivityDataController;
import com.gic.haoban.manage.web.qo.chat.GroupChatActivityInviteLogReq;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteLogExportVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteLogVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityRewardLogExportVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatDataJoinDetailVO;
import com.gic.web.common.download.DownloadHandlerAbstract;
import com.gic.web.common.download.context.Context;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Objects;
/**
* @author shangfeng
* @date 2024-10-11 17:27:51
*/
@Component
public class GroupChatActivityInviterHandle extends DownloadHandlerAbstract<GroupChatActivityInviteVO> {
public class GroupChatActivityInviterHandle extends DownloadHandlerAbstract<GroupChatActivityInviteLogExportVO> {
private static Logger log = LogManager.getLogger(GroupChatActivityInviterHandle.class);
@Resource
private GroupChatActivityDataController groupChatActivityDataController;
@Override
public List<GroupChatActivityInviteVO> getData(Context context, String s, Integer integer) {
return null;
public List<GroupChatActivityInviteLogExportVO> 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)) {
return Lists.newArrayList();
}
List<GroupChatActivityInviteLogExportVO> groupChatActivityInviteLogExportVOS = Lists.newArrayList();
for (GroupChatActivityInviteLogVO groupChatActivityInviteLogVO : groupChatActivityInviteLogVOS) {
GroupChatActivityInviteLogExportVO groupChatActivityRewardLogExportVO = new GroupChatActivityInviteLogExportVO();
BeanUtils.copyProperties(groupChatActivityInviteLogVO, groupChatActivityRewardLogExportVO);
if(groupChatActivityInviteLogVO.getMemberDeleteFlag() == 1){
groupChatActivityInviteLogVO.setName("账号已注销");
}
if (groupChatActivityInviteLogVO.getInviteType() == 0) {
groupChatActivityRewardLogExportVO.setInviteTypeDesc("否");
}else {
groupChatActivityRewardLogExportVO.setInviteTypeDesc("是");
}
if (Objects.nonNull(groupChatActivityInviteLogVO.getInvalidInviteType())) {
if(groupChatActivityInviteLogVO.getInvalidInviteType().equals(ChatActivityInvalidInviteTypeEnum.ONE.value)){
groupChatActivityRewardLogExportVO.setInvalidInviteTypeDesc("非首次参与活动受邀入群");
}else if (groupChatActivityInviteLogVO.getInvalidInviteType().equals(ChatActivityInvalidInviteTypeEnum.TWO.value)){
groupChatActivityRewardLogExportVO.setInvalidInviteTypeDesc("入群前已处于品牌群聊内");
}else if (groupChatActivityInviteLogVO.getInvalidInviteType().equals(ChatActivityInvalidInviteTypeEnum.THREE.value)){
groupChatActivityRewardLogExportVO.setInvalidInviteTypeDesc("非首次加入品牌群聊");
}
}
if (Objects.nonNull(groupChatActivityInviteLogVO.getAddMemberType())) {
if (groupChatActivityInviteLogVO.getAddMemberType() == 1) {
groupChatActivityRewardLogExportVO.setAddMemberTypeDesc("是");
}else {
groupChatActivityRewardLogExportVO.setAddMemberTypeDesc("否");
}
}
groupChatActivityInviteLogExportVOS.add(groupChatActivityRewardLogExportVO);
}
log.info("社群邀请有礼邀请明细数据导出={}", JSON.toJSONString(groupChatActivityInviteLogExportVOS));
return groupChatActivityInviteLogExportVOS;
}
@Override
public List<String> getColumnNames() {
return null;
return Lists.newArrayList();
}
@Override
......@@ -33,6 +102,25 @@ public class GroupChatActivityInviterHandle extends DownloadHandlerAbstract<Grou
@Override
public List<String> getColumns() {
return null;
return Lists.newArrayList();
}
@Override
public List<String> getColumns(Context context) {
DownloadReportDTO downloadReportDTO = context.getDownloadReportDTO();
String searchDataParams = downloadReportDTO.getSearchDataParams();
JSONObject jsonObject = JSONObject.parseObject(searchDataParams);
List<String> list = (List<String>) jsonObject.get("fieldList");
return list;
}
@Override
public List<String> getColumnNames(Context context) {
DownloadReportDTO downloadReportDTO = context.getDownloadReportDTO();
String searchDataParams = downloadReportDTO.getSearchDataParams();
JSONObject jsonObject = JSONObject.parseObject(searchDataParams);
List<String> list = (List<String>) jsonObject.get("indexList");
return list;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/handle/GroupChatActivityJoinHandle.java
package com.gic.haoban.manage.web.handle;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteVO;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.commons.util.DateUtil;
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.GroupChatActivityRewardLogReq;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteLogVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityRewardLogExportVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityRewardLogVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatDataJoinDetailVO;
import com.gic.web.common.download.DownloadHandlerAbstract;
import com.gic.web.common.download.context.Context;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.LinkedHashMap;
import java.util.List;
......@@ -15,14 +32,41 @@ import java.util.List;
*/
@Component
public class GroupChatActivityJoinHandle extends DownloadHandlerAbstract<GroupChatDataJoinDetailVO> {
private static Logger log = LogManager.getLogger(GroupChatActivityJoinHandle.class);
@Resource
private GroupChatActivityDataController groupChatActivityDataController;
@Override
public List<GroupChatDataJoinDetailVO> getData(Context context, String s, Integer integer) {
return null;
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)) {
return Lists.newArrayList();
}
List<GroupChatDataJoinDetailVO> groupChatDataJoinDetailVOS = Lists.newArrayList();
for (GroupChatActivityInviteLogVO groupChatActivityInviteLogVO : groupChatActivityInviteLogVOS) {
GroupChatActivityRewardLogExportVO groupChatActivityRewardLogExportVO = new GroupChatActivityRewardLogExportVO();
BeanUtils.copyProperties(groupChatActivityInviteLogVO, groupChatActivityRewardLogExportVO);
}
log.info("社群邀请有礼参与客户数据导出={}", JSON.toJSONString(groupChatDataJoinDetailVOS));
return groupChatDataJoinDetailVOS;
}
@Override
public List<String> getColumnNames() {
return null;
return Lists.newArrayList();
}
@Override
......@@ -32,6 +76,25 @@ public class GroupChatActivityJoinHandle extends DownloadHandlerAbstract<GroupCh
@Override
public List<String> getColumns() {
return null;
return Lists.newArrayList();
}
@Override
public List<String> getColumns(Context context) {
DownloadReportDTO downloadReportDTO = context.getDownloadReportDTO();
String searchDataParams = downloadReportDTO.getSearchDataParams();
JSONObject jsonObject = JSONObject.parseObject(searchDataParams);
List<String> list = (List<String>) jsonObject.get("fieldList");
return list;
}
@Override
public List<String> getColumnNames(Context context) {
DownloadReportDTO downloadReportDTO = context.getDownloadReportDTO();
String searchDataParams = downloadReportDTO.getSearchDataParams();
JSONObject jsonObject = JSONObject.parseObject(searchDataParams);
List<String> list = (List<String>) jsonObject.get("indexList");
return list;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/handle/GroupChatActivityRewardHandle.java
package com.gic.haoban.manage.web.handle;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatDataJoinDetailVO;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.commons.util.DateUtil;
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.GroupChatActivityRewardLogReq;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityRewardLogExportVO;
import com.gic.haoban.manage.web.vo.chat.GroupChatActivityRewardLogVO;
import com.gic.web.common.download.DownloadHandlerAbstract;
import com.gic.web.common.download.context.Context;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.LinkedHashMap;
import java.util.List;
......@@ -14,15 +28,51 @@ import java.util.List;
* @date 2024-10-11 17:30:10
*/
@Component
public class GroupChatActivityRewardHandle extends DownloadHandlerAbstract<GroupChatActivityInviteVO> {
public class GroupChatActivityRewardHandle extends DownloadHandlerAbstract<GroupChatActivityRewardLogExportVO> {
private static Logger log = LogManager.getLogger(GroupChatActivityRewardHandle.class);
@Resource
private GroupChatActivityDataController groupChatActivityDataController;
@Override
public List<GroupChatActivityInviteVO> getData(Context context, String s, Integer integer) {
return null;
public List<GroupChatActivityRewardLogExportVO> getData(Context context, String searchDataParams, Integer currentPage) {
GroupChatActivityRewardLogReq rewardLogReq = JSON.parseObject(searchDataParams, GroupChatActivityRewardLogReq.class);
rewardLogReq.setPageNum(currentPage);
rewardLogReq.setPageSize(getPageSize());
log.info("社群邀请有礼奖励明细数据导出，请求参数={}", JSON.toJSONString(rewardLogReq));
RestResponse<Page<GroupChatActivityRewardLogVO>> dataPageVORestResponse = groupChatActivityDataController.rewardDetail(rewardLogReq);
List<GroupChatActivityRewardLogVO> groupChatActivityRewardLogVOS = dataPageVORestResponse.getResult().getResult();
if (CollectionUtils.isEmpty(groupChatActivityRewardLogVOS)) {
return Lists.newArrayList();
}
List<GroupChatActivityRewardLogExportVO> groupChatActivityRewardLogExportVOS = Lists.newArrayList();
for (GroupChatActivityRewardLogVO groupChatActivityRewardLogVO : groupChatActivityRewardLogVOS) {
GroupChatActivityRewardLogExportVO groupChatActivityRewardLogExportVO = new GroupChatActivityRewardLogExportVO();
BeanUtils.copyProperties(groupChatActivityRewardLogVO, groupChatActivityRewardLogExportVO);
groupChatActivityRewardLogExportVO.setRewardTime(DateUtil.datetimeToString(groupChatActivityRewardLogVO.getCreateTime()));
groupChatActivityRewardLogExportVO.setRewardTime(DateUtil.datetimeToString(groupChatActivityRewardLogVO.getCreateTime()));
if (groupChatActivityRewardLogVO.getRewardInvite() == 1) {
groupChatActivityRewardLogExportVO.setInviteLevelType("邀请奖励");
groupChatActivityRewardLogExportVO.setInviteLevelType("达成第" + groupChatActivityRewardLogVO.getInviteLevel() + "阶梯邀请奖励");
} else {
groupChatActivityRewardLogExportVO.setInviteLevelType("受邀奖励");
groupChatActivityRewardLogExportVO.setInviteLevelType("受邀进群奖励");
}
groupChatActivityRewardLogExportVOS.add(groupChatActivityRewardLogExportVO);
}
log.info("社群邀请有礼奖励明细数据导出={}", JSON.toJSONString(groupChatActivityRewardLogExportVOS));
return groupChatActivityRewardLogExportVOS;
}
@Override
public List<String> getColumnNames() {
return null;
return Lists.newArrayList();
}
@Override
......@@ -32,6 +82,24 @@ public class GroupChatActivityRewardHandle extends DownloadHandlerAbstract<Group
@Override
public List<String> getColumns() {
return null;
return Lists.newArrayList();
}
@Override
public List<String> getColumns(Context context) {
DownloadReportDTO downloadReportDTO = context.getDownloadReportDTO();
String searchDataParams = downloadReportDTO.getSearchDataParams();
JSONObject jsonObject = JSONObject.parseObject(searchDataParams);
List<String> list = (List<String>) jsonObject.get("fieldList");
return list;
}
@Override
public List<String> getColumnNames(Context context) {
DownloadReportDTO downloadReportDTO = context.getDownloadReportDTO();
String searchDataParams = downloadReportDTO.getSearchDataParams();
JSONObject jsonObject = JSONObject.parseObject(searchDataParams);
List<String> list = (List<String>) jsonObject.get("indexList");
return list;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatActivityInviteLogReq.java 0 → 100644
package com.gic.haoban.manage.web.qo.chat;
import java.io.Serializable;
import java.util.Date;
/**
* @author shangfeng
* @date 2024-10-12 14:40:12
*/
public class GroupChatActivityInviteLogReq implements Serializable {
private static final long serialVersionUID = 4318122460400124472L;
/**
* 页编号
*/
private Integer pageNum;
/**
* 页大小
*/
private Integer pageSize;
/**
* 企业id
*/
private String enterpriseId;
/**
* 社群活动id
*/
private Long chatActivityId;
/**
* 邀请人会员ID
*/
private String inviterMemberId;
/**
* 受邀请人会员ID
*/
private String inviteeMemberId;
/**
* 有效邀请类型 1有效0无效
*/
private Integer inviteType;
/**
* 是否新增会员 1是 0否 null未统计
*/
private Integer addMemberType;
/**
* 批次
*/
private Integer batchNumber;
/**
* 开始时间
*/
private Date beginTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType;
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Long getChatActivityId() {
return chatActivityId;
}
public void setChatActivityId(Long chatActivityId) {
this.chatActivityId = chatActivityId;
}
public String getInviterMemberId() {
return inviterMemberId;
}
public void setInviterMemberId(String inviterMemberId) {
this.inviterMemberId = inviterMemberId;
}
public String getInviteeMemberId() {
return inviteeMemberId;
}
public void setInviteeMemberId(String inviteeMemberId) {
this.inviteeMemberId = inviteeMemberId;
}
public Integer getInviteType() {
return inviteType;
}
public void setInviteType(Integer inviteType) {
this.inviteType = inviteType;
}
public Integer getAddMemberType() {
return addMemberType;
}
public void setAddMemberType(Integer addMemberType) {
this.addMemberType = addMemberType;
}
public Integer getBatchNumber() {
return batchNumber;
}
public void setBatchNumber(Integer batchNumber) {
this.batchNumber = batchNumber;
}
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatActivityJoinDataReq.java 0 → 100644
package com.gic.haoban.manage.web.qo.chat;
import java.io.Serializable;
import java.util.List;
/**
* @author shangfeng
* @date 2024-10-12 10:12:32
*/
public class GroupChatActivityJoinDataReq implements Serializable {
private static final long serialVersionUID = 8101720675682708878L;
private List<Long> chatActivityIdList;
public List<Long> getChatActivityIdList() {
return chatActivityIdList;
}
public void setChatActivityIdList(List<Long> chatActivityIdList) {
this.chatActivityIdList = chatActivityIdList;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatActivityDataInviterDetailReq.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatActivityJoinDetailReq.java
......@@ -6,7 +6,7 @@ import java.io.Serializable;
* @author shangfeng
* @date 2024-10-10 16:26:38
*/
public class GroupChatActivityDataInviterDetailReq implements Serializable {
public class GroupChatActivityJoinDetailReq implements Serializable {
private static final long serialVersionUID = 2660355784426208294L;
......@@ -50,6 +50,11 @@ public class GroupChatActivityDataInviterDetailReq implements Serializable {
*/
private Integer orderByType;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType;
public Boolean getReturnTotalNum() {
return returnTotalNum;
}
......@@ -113,4 +118,12 @@ public class GroupChatActivityDataInviterDetailReq implements Serializable {
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatActivityRewardLogReq.java 0 → 100644
package com.gic.haoban.manage.web.qo.chat;
import java.io.Serializable;
import java.util.Date;
/**
* @author shangfeng
* @date 2024-10-12 10:54:22
*/
public class GroupChatActivityRewardLogReq implements Serializable {
private static final long serialVersionUID = -8126068400193316985L;
private String enterpriseId;
/**
* 社群活动id
*/
private Long chatActivityId;
/**
* 邀请人会员ID
*/
private String memberId;
/**
* 奖励人类型 1邀请人2受邀人
*/
private Integer rewardInvite;
/**
* 开始时间
*/
private Date beginTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType;
private Integer pageNum;
private Integer pageSize;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Long getChatActivityId() {
return chatActivityId;
}
public void setChatActivityId(Long chatActivityId) {
this.chatActivityId = chatActivityId;
}
public String getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public Integer getRewardInvite() {
return rewardInvite;
}
public void setRewardInvite(Integer rewardInvite) {
this.rewardInvite = rewardInvite;
}
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityInviteLogExportVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.chat;
import java.io.Serializable;
import java.util.Date;
/**
* @author shangfeng
* @date 2024-10-12 14:52:09
*/
public class GroupChatActivityInviteLogExportVO implements Serializable {
private static final long serialVersionUID = 8280940488482343219L;
/**
* 会员名称
*/
private String name;
/**
* 会员手机
*/
private String phoneNumber;
/**
* 会员别名昵称
*/
private String nickName;
/**
* 会员是否删除
* 0 正常
* 1 已删除
*/
private Integer memberDeleteFlag;
/**
* 受邀人姓名
*/
private String inviteeName;
/**
* 受邀人手机号
*/
private String inviteePhoneNumber;
/**
* 受邀人昵称
*/
private String inviteeNickName;
/**
* 群id
*/
private Long groupChatId;
/**
* 群名称
*/
private String groupChatName;
/**
* 有效邀请类型 1有效0无效
*/
private String inviteTypeDesc;
/**
* 无效邀请类型 1非首次参与活动受邀入群2入群前已处于企业群聊内3非首次加入企业群聊
*/
private String invalidInviteTypeDesc;
/**
* 是否新增会员 1是 0否 null未统计
*/
private String addMemberTypeDesc;
/**
* 入群时间
*/
private String joinGroupChatTime;
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 String getInviteeName() {
return inviteeName;
}
public void setInviteeName(String inviteeName) {
this.inviteeName = inviteeName;
}
public String getInviteePhoneNumber() {
return inviteePhoneNumber;
}
public void setInviteePhoneNumber(String inviteePhoneNumber) {
this.inviteePhoneNumber = inviteePhoneNumber;
}
public String getInviteeNickName() {
return inviteeNickName;
}
public void setInviteeNickName(String inviteeNickName) {
this.inviteeNickName = inviteeNickName;
}
public Long getGroupChatId() {
return groupChatId;
}
public void setGroupChatId(Long groupChatId) {
this.groupChatId = groupChatId;
}
public String getGroupChatName() {
return groupChatName;
}
public void setGroupChatName(String groupChatName) {
this.groupChatName = groupChatName;
}
public String getInviteTypeDesc() {
return inviteTypeDesc;
}
public void setInviteTypeDesc(String inviteTypeDesc) {
this.inviteTypeDesc = inviteTypeDesc;
}
public String getInvalidInviteTypeDesc() {
return invalidInviteTypeDesc;
}
public void setInvalidInviteTypeDesc(String invalidInviteTypeDesc) {
this.invalidInviteTypeDesc = invalidInviteTypeDesc;
}
public String getAddMemberTypeDesc() {
return addMemberTypeDesc;
}
public void setAddMemberTypeDesc(String addMemberTypeDesc) {
this.addMemberTypeDesc = addMemberTypeDesc;
}
public String getJoinGroupChatTime() {
return joinGroupChatTime;
}
public void setJoinGroupChatTime(String joinGroupChatTime) {
this.joinGroupChatTime = joinGroupChatTime;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityInviteLogVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.chat;
import java.io.Serializable;
import java.util.Date;
/**
* @author shangfeng
* @date 2024-10-09 15:30:26
*/
public class GroupChatActivityInviteLogVO implements Serializable {
private static final long serialVersionUID = -7144700091431890994L;
/**
* 会员名称
*/
private String name;
/**
* 会员手机
*/
private String phoneNumber;
/**
* 会员别名昵称
*/
private String nickName;
/**
* 会员是否删除
* 0 正常
* 1 已删除
*/
private Integer memberDeleteFlag;
/**
* 受邀人会员名称
*/
private String inviteeName;
/**
* 受邀人会员手机
*/
private String inviteePhoneNumber;
/**
* 受邀人会员别名昵称
*/
private String inviteeNickName;
/**
* 社群活动id
*/
private Long chatActivityId;
/**
* 邀请人会员ID
*/
private String inviterMemberId;
/**
* 受邀人会员ID
*/
private String inviteeMemberId;
/**
* 受邀人外部联系人id
*/
private String inviteeUserId;
/**
* 姓名
*/
private String userName;
/**
* 群id
*/
private Long groupChatId;
/**
* 群名称
*/
private String groupChatName;
/**
* 有效邀请类型 1有效0无效
*/
private Integer inviteType;
/**
* 无效邀请类型 1非首次参与活动受邀入群2入群前已处于企业群聊内3非首次加入企业群聊
*/
private Integer invalidInviteType;
/**
* 是否新增会员 1是 0否 null未统计
*/
private Integer addMemberType;
/**
* 企业ID
*/
private String enterpriseId;
/**
* 入群时间
*/
private Date createTime;
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 String getInviteeName() {
return inviteeName;
}
public void setInviteeName(String inviteeName) {
this.inviteeName = inviteeName;
}
public String getInviteePhoneNumber() {
return inviteePhoneNumber;
}
public void setInviteePhoneNumber(String inviteePhoneNumber) {
this.inviteePhoneNumber = inviteePhoneNumber;
}
public String getInviteeNickName() {
return inviteeNickName;
}
public void setInviteeNickName(String inviteeNickName) {
this.inviteeNickName = inviteeNickName;
}
public Long getChatActivityId() {
return chatActivityId;
}
public void setChatActivityId(Long chatActivityId) {
this.chatActivityId = chatActivityId;
}
public String getInviterMemberId() {
return inviterMemberId;
}
public void setInviterMemberId(String inviterMemberId) {
this.inviterMemberId = inviterMemberId;
}
public String getInviteeMemberId() {
return inviteeMemberId;
}
public void setInviteeMemberId(String inviteeMemberId) {
this.inviteeMemberId = inviteeMemberId;
}
public String getInviteeUserId() {
return inviteeUserId;
}
public void setInviteeUserId(String inviteeUserId) {
this.inviteeUserId = inviteeUserId;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public Long getGroupChatId() {
return groupChatId;
}
public void setGroupChatId(Long groupChatId) {
this.groupChatId = groupChatId;
}
public String getGroupChatName() {
return groupChatName;
}
public void setGroupChatName(String groupChatName) {
this.groupChatName = groupChatName;
}
public Integer getInviteType() {
return inviteType;
}
public void setInviteType(Integer inviteType) {
this.inviteType = inviteType;
}
public Integer getInvalidInviteType() {
return invalidInviteType;
}
public void setInvalidInviteType(Integer invalidInviteType) {
this.invalidInviteType = invalidInviteType;
}
public Integer getAddMemberType() {
return addMemberType;
}
public void setAddMemberType(Integer addMemberType) {
this.addMemberType = addMemberType;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityInviteVO.java deleted 100644 → 0
package com.gic.haoban.manage.web.vo.chat;
import java.io.Serializable;
import java.util.Date;
/**
* @author shangfeng
* @date 2024-10-09 15:30:26
*/
public class GroupChatActivityInviteVO implements Serializable {
private static final long serialVersionUID = -7144700091431890994L;
/**
* 头像
*/
private String photoUrl;
/**
* 昵称
*/
private String nickName;
/**
* 有效邀请类型 1有效0无效
*/
private Integer inviteType;
/**
* 无效邀请类型 1非首次参与活动受邀入群2入群前已处于企业群聊内3非首次加入企业群聊
*/
private Integer invalidInviteType;
/**
* 邀请时间
*/
private Date createTime;
public String getPhotoUrl() {
return photoUrl;
}
public void setPhotoUrl(String photoUrl) {
this.photoUrl = photoUrl;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public Integer getInviteType() {
return inviteType;
}
public void setInviteType(Integer inviteType) {
this.inviteType = inviteType;
}
public Integer getInvalidInviteType() {
return invalidInviteType;
}
public void setInvalidInviteType(Integer invalidInviteType) {
this.invalidInviteType = invalidInviteType;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityJoinDataVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.chat;
import java.io.Serializable;
/**
* @author shangfeng
* @date 2024-10-12 10:07:35
*/
public class GroupChatActivityJoinDataVO implements Serializable {
private static final long serialVersionUID = 753629197049532832L;
private Long chatActivityId;
/**
* 参与人数
*/
private Integer inviterNum = 0;
/**
* 邀请进群人数
*/
private Integer inviteeNum = 0;
/**
* 有效邀请人数
*/
private Integer effectiveInviteeNum = 0;
public Long getChatActivityId() {
return chatActivityId;
}
public void setChatActivityId(Long chatActivityId) {
this.chatActivityId = chatActivityId;
}
public Integer getInviterNum() {
return inviterNum;
}
public void setInviterNum(Integer inviterNum) {
this.inviterNum = inviterNum;
}
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;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityRewardLogExportVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.chat;
import java.io.Serializable;
import java.util.Date;
/**
* @author shangfeng
* @date 2024-10-12 11:04:43
*/
public class GroupChatActivityRewardLogExportVO implements Serializable {
private static final long serialVersionUID = 881973792150280113L;
/**
* 会员是否删除
* 0 正常
* 1 已删除
*/
private Integer memberDeleteFlag;
/**
* 奖励人类型 1邀请人2受邀人
*/
private String rewardInviteType;
/**
* 奖励阶梯 阶梯奖励，其他奖励默认1
*/
private String inviteLevelType;
/**
* 奖励时间
*/
private String rewardTime;
/**
* 会员名称
*/
private String name;
/**
* 会员手机
*/
private String phoneNumber;
/**
* 会员别名昵称
*/
private String nickName;
/**
* 奖励积分
*/
private Integer integral;
/**
* 奖励成长值
*/
private Integer growth;
/**
* 奖励卡券
*/
private String cardInfo;
public Integer getMemberDeleteFlag() {
return memberDeleteFlag;
}
public void setMemberDeleteFlag(Integer memberDeleteFlag) {
this.memberDeleteFlag = memberDeleteFlag;
}
public String getRewardInviteType() {
return rewardInviteType;
}
public void setRewardInviteType(String rewardInviteType) {
this.rewardInviteType = rewardInviteType;
}
public String getInviteLevelType() {
return inviteLevelType;
}
public void setInviteLevelType(String inviteLevelType) {
this.inviteLevelType = inviteLevelType;
}
public String getRewardTime() {
return rewardTime;
}
public void setRewardTime(String rewardTime) {
this.rewardTime = rewardTime;
}
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 getIntegral() {
return integral;
}
public void setIntegral(Integer integral) {
this.integral = integral;
}
public Integer getGrowth() {
return growth;
}
public void setGrowth(Integer growth) {
this.growth = growth;
}
public String getCardInfo() {
return cardInfo;
}
public void setCardInfo(String cardInfo) {
this.cardInfo = cardInfo;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityRewardVO.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityRewardLogVO.java
......@@ -8,7 +8,7 @@ import java.util.List;
* @author shangfeng
* @date 2024-10-10 15:40:38
*/
public class GroupChatActivityRewardVO implements Serializable {
public class GroupChatActivityRewardLogVO implements Serializable {
private static final long serialVersionUID = -5069228984771030367L;
......@@ -28,6 +28,13 @@ public class GroupChatActivityRewardVO implements Serializable {
private String memberId;
/**
* 会员是否删除
* 0 正常
* 1 已删除
*/
private Integer memberDeleteFlag;
/**
* 奖励人类型 1邀请人2受邀人
*/
private Integer rewardInvite;
......@@ -43,9 +50,34 @@ public class GroupChatActivityRewardVO implements Serializable {
private Date createTime;
/**
* 奖励明细 卡券、积分、成长值
* 会员名称
*/
private String name;
/**
* 会员手机
*/
private List<GroupChatActivityRewardDetailVO> groupChatActivityRewardDetailVOList;
private String phoneNumber;
/**
* 会员别名昵称
*/
private String nickName;
/**
* 奖励积分
*/
private Integer integral = 0;
/**
* 奖励成长值
*/
private Integer growth = 0;
/**
* 奖励卡券
*/
private String cardInfo;
public Long getChatActivityRewardLogId() {
return chatActivityRewardLogId;
......@@ -71,6 +103,14 @@ public class GroupChatActivityRewardVO implements Serializable {
this.memberId = memberId;
}
public Integer getMemberDeleteFlag() {
return memberDeleteFlag;
}
public void setMemberDeleteFlag(Integer memberDeleteFlag) {
this.memberDeleteFlag = memberDeleteFlag;
}
public Integer getRewardInvite() {
return rewardInvite;
}
......@@ -95,11 +135,51 @@ public class GroupChatActivityRewardVO implements Serializable {
this.createTime = createTime;
}
public List<GroupChatActivityRewardDetailVO> getGroupChatActivityRewardDetailVOList() {
return groupChatActivityRewardDetailVOList;
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 getIntegral() {
return integral;
}
public void setIntegral(Integer integral) {
this.integral = integral;
}
public Integer getGrowth() {
return growth;
}
public void setGrowth(Integer growth) {
this.growth = growth;
}
public String getCardInfo() {
return cardInfo;
}
public void setGroupChatActivityRewardDetailVOList(List<GroupChatActivityRewardDetailVO> groupChatActivityRewardDetailVOList) {
this.groupChatActivityRewardDetailVOList = groupChatActivityRewardDetailVOList;
public void setCardInfo(String cardInfo) {
this.cardInfo = cardInfo;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatDataOverviewVO.java
......@@ -65,5 +65,91 @@ public class GroupChatDataOverviewVO implements Serializable {
*/
private String cardCnt;
public String getChatActivityId() {
return chatActivityId;
}
public void setChatActivityId(String chatActivityId) {
this.chatActivityId = chatActivityId;
}
public String getShareNum() {
return shareNum;
}
public void setShareNum(String shareNum) {
this.shareNum = shareNum;
}
public String getInviterNum() {
return inviterNum;
}
public void setInviterNum(String inviterNum) {
this.inviterNum = inviterNum;
}
public String getInviteeNum() {
return inviteeNum;
}
public void setInviteeNum(String inviteeNum) {
this.inviteeNum = inviteeNum;
}
public String getEffectiveInviteeNum() {
return effectiveInviteeNum;
}
public void setEffectiveInviteeNum(String effectiveInviteeNum) {
this.effectiveInviteeNum = effectiveInviteeNum;
}
public String getInviteeMemberNum() {
return inviteeMemberNum;
}
public void setInviteeMemberNum(String inviteeMemberNum) {
this.inviteeMemberNum = inviteeMemberNum;
}
public String getInviteeNonMemberNum() {
return inviteeNonMemberNum;
}
public void setInviteeNonMemberNum(String inviteeNonMemberNum) {
this.inviteeNonMemberNum = inviteeNonMemberNum;
}
public String getNewMemberNum() {
return newMemberNum;
}
public void setNewMemberNum(String newMemberNum) {
this.newMemberNum = newMemberNum;
}
public String getIntegralCnt() {
return integralCnt;
}
public void setIntegralCnt(String integralCnt) {
this.integralCnt = integralCnt;
}
public String getGrowCnt() {
return growCnt;
}
public void setGrowCnt(String growCnt) {
this.growCnt = growCnt;
}
public String getCardCnt() {
return cardCnt;
}
public void setCardCnt(String cardCnt) {
this.cardCnt = cardCnt;
}
}
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