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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatActivityRewardDetailLogDTO.java

+package com.gic.haoban.manage.api.dto.chat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 10:13:56
+ */
+public class GroupChatActivityRewardDetailLogDTO implements Serializable {
+
+    private static final long serialVersionUID = -6244377713277293414L;
+
+    /**
+     * 社群活动奖励明细id
+     */
+    private Long chatActivityRewardDetailId;
+
+    /**
+     * 社群活动奖励id
+     */
+    private Long chatActivityRewardId;
+
+    /**
+     * 社群活动id
+     */
+    private Long chatActivityId;
+
+    /**
+     * 社群活动奖励规则id
+     */
+    private Long activityRewardId;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 奖励类型 1积分2成长值3卡券
+     */
+    private Integer rewardType;
+
+    /**
+     * 奖励内容 积分值 成长值 卡券id
+     */
+    private String rewardValue;
+
+    /**
+     * 奖励名称
+     */
+    private String rewardName;
+
+    /**
+     * 奖励内容备注
+     */
+    private String rewardRemark;
+
+    /**
+     * 奖励关联业务日志id
+     */
+    private String rewardBusinessId;
+
+    /**
+     * 操作奖励是否成功 1是 0否
+     */
+    private Integer successFlag;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+    /**
+     * 微信企业ID
+     */
+    private String wxEnterpriseId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getChatActivityRewardDetailId() {
+        return chatActivityRewardDetailId;
+    }
+
+    public void setChatActivityRewardDetailId(Long chatActivityRewardDetailId) {
+        this.chatActivityRewardDetailId = chatActivityRewardDetailId;
+    }
+
+    public Long getChatActivityRewardId() {
+        return chatActivityRewardId;
+    }
+
+    public void setChatActivityRewardId(Long chatActivityRewardId) {
+        this.chatActivityRewardId = chatActivityRewardId;
+    }
+
+    public Long getChatActivityId() {
+        return chatActivityId;
+    }
+
+    public void setChatActivityId(Long chatActivityId) {
+        this.chatActivityId = chatActivityId;
+    }
+
+    public Long getActivityRewardId() {
+        return activityRewardId;
+    }
+
+    public void setActivityRewardId(Long activityRewardId) {
+        this.activityRewardId = activityRewardId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public Integer getRewardType() {
+        return rewardType;
+    }
+
+    public void setRewardType(Integer rewardType) {
+        this.rewardType = rewardType;
+    }
+
+    public String getRewardValue() {
+        return rewardValue;
+    }
+
+    public void setRewardValue(String rewardValue) {
+        this.rewardValue = rewardValue;
+    }
+
+    public String getRewardName() {
+        return rewardName;
+    }
+
+    public void setRewardName(String rewardName) {
+        this.rewardName = rewardName;
+    }
+
+    public String getRewardRemark() {
+        return rewardRemark;
+    }
+
+    public void setRewardRemark(String rewardRemark) {
+        this.rewardRemark = rewardRemark;
+    }
+
+    public String getRewardBusinessId() {
+        return rewardBusinessId;
+    }
+
+    public void setRewardBusinessId(String rewardBusinessId) {
+        this.rewardBusinessId = rewardBusinessId;
+    }
+
+    public Integer getSuccessFlag() {
+        return successFlag;
+    }
+
+    public void setSuccessFlag(Integer successFlag) {
+        this.successFlag = successFlag;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatActivityRewardLogDTO.java

+package com.gic.haoban.manage.api.dto.chat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 10:11:34
+ */
+public class GroupChatActivityRewardLogDTO implements Serializable {
+
+    private static final long serialVersionUID = -5926101376740603421L;
+
+    /**
+     * 社群活动奖励id
+     */
+    private Long chatActivityRewardId;
+
+    /**
+     * 社群活动id
+     */
+    private Long chatActivityId;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 奖励人类型 1邀请人2受邀人
+     */
+    private Integer rewardInvite;
+
+    /**
+     * 奖励阶梯 阶梯奖励，其他奖励默认1
+     */
+    private Integer inviteLevel;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+    /**
+     * 微信企业ID
+     */
+    private String wxEnterpriseId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private List<GroupChatActivityRewardDetailLogDTO> rewardDetailLogDTOList;
+
+    public Long getChatActivityRewardId() {
+        return chatActivityRewardId;
+    }
+
+    public void setChatActivityRewardId(Long chatActivityRewardId) {
+        this.chatActivityRewardId = chatActivityRewardId;
+    }
+
+    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 Integer getInviteLevel() {
+        return inviteLevel;
+    }
+
+    public void setInviteLevel(Integer inviteLevel) {
+        this.inviteLevel = inviteLevel;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public List<GroupChatActivityRewardDetailLogDTO> getRewardDetailLogDTOList() {
+        return rewardDetailLogDTOList;
+    }
+
+    public void setRewardDetailLogDTOList(List<GroupChatActivityRewardDetailLogDTO> rewardDetailLogDTOList) {
+        this.rewardDetailLogDTOList = rewardDetailLogDTOList;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatActivityInviteLogQDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/chat/GroupChatActivityInviteLogQDTO.java

-package com.gic.haoban.manage.api.dto.qdto.chat;
+package com.gic.haoban.manage.api.qdto.chat;
+
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.commons.web.qo.PageQo;
 
 import java.io.Serializable;
 
@@ -6,7 +9,7 @@ import java.io.Serializable;
  * @author shangfeng
  * @date 2024-10-08 14:00:59
  */
-public class GroupChatActivityInviteLogQDTO implements Serializable {
+public class GroupChatActivityInviteLogQDTO extends BasePageInfo implements Serializable {
 
     private static final long serialVersionUID = -3517354863714637621L;
 
@@ -32,6 +35,16 @@ public class GroupChatActivityInviteLogQDTO implements Serializable {
      */
     private Integer batchNumber;
 
+    /**
+     * 排序字段
+     */
+    private String sortFiled;
+
+    /**
+     * 排序类型
+     */
+    private String sortType;
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -71,4 +84,20 @@ public class GroupChatActivityInviteLogQDTO implements Serializable {
     public void setBatchNumber(Integer batchNumber) {
         this.batchNumber = batchNumber;
     }
+
+    public String getSortFiled() {
+        return sortFiled;
+    }
+
+    public void setSortFiled(String sortFiled) {
+        this.sortFiled = sortFiled;
+    }
+
+    public String getSortType() {
+        return sortType;
+    }
+
+    public void setSortType(String sortType) {
+        this.sortType = sortType;
+    }
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/chat/GroupChatActivityRewardDetailLogQDTO.java

+package com.gic.haoban.manage.api.qdto.chat;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 10:41:40
+ */
+public class GroupChatActivityRewardDetailLogQDTO implements Serializable {
+
+    private static final long serialVersionUID = -2314846257775934409L;
+
+    private List<Long> rewardLogIdList;
+
+    public List<Long> getRewardLogIdList() {
+        return rewardLogIdList;
+    }
+
+    public void setRewardLogIdList(List<Long> rewardLogIdList) {
+        this.rewardLogIdList = rewardLogIdList;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/chat/GroupChatActivityRewardLogQDTO.java

+package com.gic.haoban.manage.api.qdto.chat;
+
+import com.gic.api.base.commons.BasePageInfo;
+
+import java.io.Serializable;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 10:18:00
+ */
+public class GroupChatActivityRewardLogQDTO extends BasePageInfo implements Serializable {
+    private static final long serialVersionUID = -7610364164825668426L;
+
+    private String enterpriseId;
+
+    /**
+     * 社群活动id
+     */
+    private Long chatActivityId;
+
+    /**
+     * 邀请人会员ID
+     */
+    private String memberId;
+
+    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;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatActivityInviteLogApiService.java

 package com.gic.haoban.manage.api.service.chat;
 
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
-import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatActivityInviteLogQDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
 
 import java.util.List;
 
@@ -12,7 +13,6 @@ import java.util.List;
  */
 public interface GroupChatActivityInviteLogApiService {
 
-
     /**
      * 查询C端邀请人数据
      *
@@ -20,4 +20,13 @@ public interface GroupChatActivityInviteLogApiService {
      * @return
      */
     ServiceResponse<List<GroupChatActivityInviteLogDTO>> queryMaxBatchInviteLog(GroupChatActivityInviteLogQDTO inviteLogQDTO);
+
+    /**
+     * 邀请明细
+     *
+     * @param inviteLogQDTO
+     * @return
+     */
+    ServiceResponse<Page<GroupChatActivityInviteLogDTO>> queryInviteLogDetails(GroupChatActivityInviteLogQDTO inviteLogQDTO);
+
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatActivityRewardLogApiService.java

+package com.gic.haoban.manage.api.service.chat;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 10:59:53
+ */
+public interface GroupChatActivityRewardLogApiService {
+
+    /**
+     * 查询奖励详情
+     *
+     * @param rewardLogQDTO
+     * @return
+     */
+    ServiceResponse<Page<GroupChatActivityRewardLogDTO>> queryRewardLogDetails(GroupChatActivityRewardLogQDTO rewardLogQDTO);
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatActivityInviteLogMapper.java

 package com.gic.haoban.manage.service.dao.mapper.chat;
 
-import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatActivityInviteLogQDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatActivityInviteLog;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatActivityRewardDetailLogMapper.java

 package com.gic.haoban.manage.service.dao.mapper.chat;
 
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardDetailLogQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatActivityRewardDetailLog;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
@@ -63,5 +64,12 @@ public interface GroupChatActivityRewardDetailLogMapper {
      */
     int deleteById(Long chatActivityRewardDetailId);
 
+    /**
+     * 批量查询奖励明细
+     *
+     * @param rewardDetailLogQDTO
+     * @return
+     */
+    List<TabGroupChatActivityRewardDetailLog> queryList(GroupChatActivityRewardDetailLogQDTO rewardDetailLogQDTO);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatActivityRewardLogMapper.java

 package com.gic.haoban.manage.service.dao.mapper.chat;
 
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatActivityRewardLog;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
@@ -63,5 +65,12 @@ public interface GroupChatActivityRewardLogMapper {
      */
     int deleteById(Long chatActivityRewardId);
 
+    /**
+     * 查询奖励数据
+     *
+     * @param rewardLogQDTO
+     * @return
+     */
+    List<TabGroupChatActivityRewardLog> queryList(GroupChatActivityRewardLogQDTO rewardLogQDTO);
 }
 

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

 package com.gic.haoban.manage.service.service.chat;
 
+import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
-import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatActivityInviteLogQDTO;
-import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatActivityInviteLogMapper;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
 
 import java.util.List;
 
@@ -22,4 +22,11 @@ public interface GroupChatActivityInviteLogService {
      */
     List<GroupChatActivityInviteLogDTO> queryMaxBatchInviteLog(GroupChatActivityInviteLogQDTO groupChatActivityInviteLogQDTO);
 
+    /**
+     * 查询奖励明细
+     *
+     * @param inviteLogQDTO
+     * @return
+     */
+    Page<GroupChatActivityInviteLogDTO> queryInviteLogDetails(GroupChatActivityInviteLogQDTO inviteLogQDTO);
 }

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

 package com.gic.haoban.manage.service.service.chat;
 
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardDetailLogDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardDetailLogQDTO;
+
+import java.util.List;
+
 /**
  * 社群活动完成奖励明细表(TabHaobanGroupChatActivityRewardDetailLog)表服务接口
  *
@@ -8,4 +13,12 @@ package com.gic.haoban.manage.service.service.chat;
  */
 public interface GroupChatActivityRewardDetailLogService {
 
+    /**
+     * 查询奖励明细数据
+     *
+     * @param rewardDetailLogQDTO
+     * @return
+     */
+    List<GroupChatActivityRewardDetailLogDTO> queryList(GroupChatActivityRewardDetailLogQDTO rewardDetailLogQDTO);
+
 }

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

 package com.gic.haoban.manage.service.service.chat;
 
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
+
 /**
  * 内容活动完成奖励表(TabHaobanGroupChatActivityRewardLog)表服务接口
  *
@@ -8,4 +12,13 @@ package com.gic.haoban.manage.service.service.chat;
  */
 public interface GroupChatActivityRewardLogService {
 
+
+    /**
+     * 奖励明细
+     *
+     * @param rewardLogQDTO
+     * @return
+     */
+    Page<GroupChatActivityRewardLogDTO> queryRewardLogDetails(GroupChatActivityRewardLogQDTO rewardLogQDTO);
+
 }

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

 package com.gic.haoban.manage.service.service.chat.impl;
 
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
-import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatActivityInviteLogQDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatActivityInviteLogMapper;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatActivityInviteLog;
 import com.gic.haoban.manage.service.service.chat.GroupChatActivityInviteLogService;
+import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -45,4 +48,11 @@ public class GroupChatActivityInviteLogServiceImpl implements GroupChatActivityI
         }
         return logList.stream().map(this::convertToDTO).collect(Collectors.toList());
     }
+
+    @Override
+    public Page<GroupChatActivityInviteLogDTO> queryInviteLogDetails(GroupChatActivityInviteLogQDTO inviteLogQDTO) {
+        PageHelper.startPage(inviteLogQDTO);
+        List<TabGroupChatActivityInviteLog> logList = groupChatActivityInviteLogMapper.queryList(inviteLogQDTO);
+        return PageHelperUtils.changePageHelperToCurrentPage(logList, GroupChatActivityInviteLogDTO.class);
+    }
 }

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

 package com.gic.haoban.manage.service.service.chat.impl;
 
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardDetailLogDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardDetailLogQDTO;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatActivityRewardDetailLogMapper;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatActivityInviteLog;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatActivityRewardDetailLog;
 import com.gic.haoban.manage.service.service.chat.GroupChatActivityRewardDetailLogService;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 社群活动完成奖励明细表(TabHaobanGroupChatActivityRewardDetailLog)表服务实现类
@@ -17,4 +27,18 @@ public class GroupChatActivityRewardDetailLogServiceImpl implements GroupChatAct
     @Resource
     private GroupChatActivityRewardDetailLogMapper groupChatActivityRewardDetailLogMapper;
 
+    private GroupChatActivityRewardDetailLogDTO convertToDTO(TabGroupChatActivityRewardDetailLog tabGroupChatActivityRewardDetailLog){
+        GroupChatActivityRewardDetailLogDTO groupChatActivityRewardDetailLogDTO = new GroupChatActivityRewardDetailLogDTO();
+        BeanUtils.copyProperties(tabGroupChatActivityRewardDetailLog,groupChatActivityRewardDetailLogDTO);
+        return groupChatActivityRewardDetailLogDTO;
+    }
+
+    @Override
+    public List<GroupChatActivityRewardDetailLogDTO> queryList(GroupChatActivityRewardDetailLogQDTO rewardDetailLogQDTO) {
+        List<TabGroupChatActivityRewardDetailLog> rewardDetailLogDTOList = groupChatActivityRewardDetailLogMapper.queryList(rewardDetailLogQDTO);
+        if(CollectionUtils.isEmpty(rewardDetailLogDTOList)){
+            return Lists.newArrayList();
+        }
+        return rewardDetailLogDTOList.stream().map(this::convertToDTO).collect(Collectors.toList());
+    }
 }

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

 package com.gic.haoban.manage.service.service.chat.impl;
 
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardDetailLogDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardDetailLogQDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatActivityRewardLogMapper;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatActivityInviteLog;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatActivityRewardLog;
+import com.gic.haoban.manage.service.service.chat.GroupChatActivityRewardDetailLogService;
 import com.gic.haoban.manage.service.service.chat.GroupChatActivityRewardLogService;
+import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 内容活动完成奖励表(TabHaobanGroupChatActivityRewardLog)表服务实现类
@@ -14,7 +31,45 @@ import javax.annotation.Resource;
  */
 @Service("groupChatActivityRewardLogService")
 public class GroupChatActivityRewardLogServiceImpl implements GroupChatActivityRewardLogService {
+
     @Resource
     private GroupChatActivityRewardLogMapper groupChatActivityRewardLogMapper;
 
+    @Resource
+    private GroupChatActivityRewardDetailLogService groupChatActivityRewardDetailLogService;
+
+    private GroupChatActivityRewardLogDTO convertToDTO(TabGroupChatActivityRewardLog tabGroupChatActivityRewardLog) {
+        GroupChatActivityRewardLogDTO groupChatActivityRewardLogDTO = new GroupChatActivityRewardLogDTO();
+        BeanUtils.copyProperties(tabGroupChatActivityRewardLog, groupChatActivityRewardLogDTO);
+        return groupChatActivityRewardLogDTO;
+    }
+
+    @Override
+    public Page<GroupChatActivityRewardLogDTO> queryRewardLogDetails(GroupChatActivityRewardLogQDTO rewardLogQDTO) {
+        PageHelper.startPage(rewardLogQDTO);
+        List<TabGroupChatActivityRewardLog> rewardLogList = groupChatActivityRewardLogMapper.queryList(rewardLogQDTO);
+        if (CollectionUtils.isEmpty(rewardLogList)) {
+            return PageHelperUtils.changePageHelperToCurrentPage(rewardLogList, GroupChatActivityRewardLogDTO.class);
+        }
+        List<Long> rewardLogIdList = rewardLogList.stream()
+                .map(TabGroupChatActivityRewardLog::getChatActivityRewardId).collect(Collectors.toList());
+        GroupChatActivityRewardDetailLogQDTO rewardDetailLogQDTO = new GroupChatActivityRewardDetailLogQDTO();
+        rewardDetailLogQDTO.setRewardLogIdList(rewardLogIdList);
+        List<GroupChatActivityRewardDetailLogDTO> rewardDetailLogDTOList = groupChatActivityRewardDetailLogService.queryList(rewardDetailLogQDTO);
+        Map<Long, List<GroupChatActivityRewardDetailLogDTO>> rewardDetailLogDTOMap = Maps.newHashMap();
+        if (CollectionUtils.isNotEmpty(rewardDetailLogDTOList)) {
+            rewardDetailLogDTOMap = rewardDetailLogDTOList.stream()
+                    .collect(Collectors.groupingBy(GroupChatActivityRewardDetailLogDTO::getChatActivityRewardId));
+        }
+        Map<Long, List<GroupChatActivityRewardDetailLogDTO>> finalRewardDetailLogDTOMap = rewardDetailLogDTOMap;
+
+        List<GroupChatActivityRewardLogDTO> rewardLogDTOList = rewardLogList.stream().map(tabGroupChatActivityRewardLog -> {
+            GroupChatActivityRewardLogDTO rewardLogDTO = convertToDTO(tabGroupChatActivityRewardLog);
+            rewardLogDTO.setRewardDetailLogDTOList(finalRewardDetailLogDTOMap.get(rewardLogDTO.getChatActivityRewardId()));
+            return rewardLogDTO;
+
+        }).collect(Collectors.toList());
+
+        return PageHelperUtils.changePageHelperToCurrentPage(rewardLogDTOList, GroupChatActivityRewardLogDTO.class);
+    }
 }

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

 package com.gic.haoban.manage.service.service.out.impl.chat;
 
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
-import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatActivityInviteLogQDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatActivityInviteLogApiService;
 import com.gic.haoban.manage.service.service.chat.GroupChatActivityInviteLogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,4 +25,9 @@ public class GroupChatActivityInviteLogApiServiceImpl implements GroupChatActivi
     public ServiceResponse<List<GroupChatActivityInviteLogDTO>> queryMaxBatchInviteLog(GroupChatActivityInviteLogQDTO inviteLogQDTO) {
         return ServiceResponse.success(groupChatActivityInviteLogService.queryMaxBatchInviteLog(inviteLogQDTO));
     }
+
+    @Override
+    public ServiceResponse<Page<GroupChatActivityInviteLogDTO>> queryInviteLogDetails(GroupChatActivityInviteLogQDTO inviteLogQDTO) {
+        return ServiceResponse.success(groupChatActivityInviteLogService.queryInviteLogDetails(inviteLogQDTO));
+    }
 }

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

+package com.gic.haoban.manage.service.service.out.impl.chat;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
+import com.gic.haoban.manage.api.service.chat.GroupChatActivityRewardLogApiService;
+import com.gic.haoban.manage.service.service.chat.GroupChatActivityRewardLogService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 11:02:50
+ */
+@Service("groupChatActivityRewardLogApiService")
+public class GroupChatActivityRewardLogApiServiceImpl implements GroupChatActivityRewardLogApiService {
+
+    @Resource
+    private GroupChatActivityRewardLogService groupChatActivityRewardLogService;
+
+    @Override
+    public ServiceResponse<Page<GroupChatActivityRewardLogDTO>> queryRewardLogDetails(GroupChatActivityRewardLogQDTO rewardLogQDTO) {
+        return ServiceResponse.success(groupChatActivityRewardLogService.queryRewardLogDetails(rewardLogQDTO));
+    }
+}

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -247,5 +247,6 @@
     <!--  社群邀请有礼  -->
     <dubbo:service interface="com.gic.haoban.manage.api.service.chat.GroupChatActivityInviteLogApiService"
                    ref="groupChatActivityInviteLogApiService" timeout="10000"/>
-
+    <dubbo:service interface="com.gic.haoban.manage.api.service.chat.GroupChatActivityRewardLogApiService"
+                   ref="groupChatActivityRewardLogApiService" timeout="10000"/>
 </beans>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatActivityInviteLogMapper.xml

@@ -27,7 +27,6 @@
         , chat_activity_id, inviter_member_id, invitee_member_id, invitee_user_id,
                user_name, nick_name, group_chat_id, invite_type, invalid_invite_type, add_member_type, batch_number,
                enterprise_id, wx_enterprise_id, create_time, update_time, delete_flag
-        from tab_haoban_group_chat_activity_invite_log
     </sql>
 
     <!--查询单个-->
@@ -173,8 +172,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_group_chat_activity_invite_log
-        where
-        delete_flag = 0
+        where delete_flag = 0
         <if test="enterpriseId != null and enterpriseId != '' ">
             and enterprise_id = #{enterpriseId}
         </if>
@@ -190,6 +188,8 @@
         <if test="inviteType != null">
             and invite_type = #{inviteType}
         </if>
-        order by create_time asc
+        <if test="sortFiled != null">
+            order by #{sortFiled} #{sortType}
+        </if>
     </select>
 </mapper>

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatActivityRewardDetailLogMapper.xml

@@ -21,6 +21,14 @@
         <result property="deleteFlag" column="delete_flag" jdbcType="INTEGER"/>
     </resultMap>
 
+    <sql id="Base_Column_List">
+        chat_activity_reward_detail_id
+        , chat_activity_reward_id, chat_activity_id,
+        activity_reward_id, member_id, reward_type, reward_value,
+            reward_name, reward_remark, reward_business_id,
+        success_flag, enterprise_id, wx_enterprise_id, create_time, update_time, delete_flag
+    </sql>
+
     <!--查询单个-->
     <select id="queryById" resultMap="TabHaobanGroupChatActivityRewardDetailLogMap">
         select chat_activity_reward_detail_id, chat_activity_reward_id, chat_activity_id, activity_reward_id, member_id, reward_type, reward_value, reward_name, reward_remark, reward_business_id, success_flag, enterprise_id, wx_enterprise_id, create_time, update_time, delete_flag
@@ -227,5 +235,18 @@
         from tab_haoban_group_chat_activity_reward_detail_log
         where chat_activity_reward_detail_id = #{chatActivityRewardDetailId}
     </delete>
+
+    <select id="queryList" resultMap="TabHaobanGroupChatActivityRewardDetailLogMap">
+        select
+        <include refid="Base_Column_List"></include>
+        from tab_haoban_group_chat_activity_reward_detail_log
+        where delete_flag = 0
+        <if test="rewardLogIdList != null">
+           and chat_activity_reward_id in
+            <foreach collection="rewardLogIdList" item="rewardLogId" separator="," open="(" close=")">
+                #{rewardLogId}
+            </foreach>
+        </if>
+    </select>
 </mapper>
 

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatActivityRewardLogMapper.xml

@@ -14,6 +14,14 @@
         <result property="deleteFlag" column="delete_flag" jdbcType="INTEGER"/>
     </resultMap>
 
+    <sql id="Base_Column_List">
+        chat_activity_reward_id
+        , chat_activity_id,
+            member_id, reward_invite, invite_level,
+        enterprise_id, wx_enterprise_id,
+            create_time, update_time, delete_flag
+    </sql>
+
     <!--查询单个-->
     <select id="queryById" resultMap="TabHaobanGroupChatActivityRewardLogMap">
         select chat_activity_reward_log_id, chat_activity_id, member_id, reward_invite, invite_level, enterprise_id, wx_enterprise_id, create_time, update_time, delete_flag
@@ -140,5 +148,22 @@
         from tab_haoban_group_chat_activity_reward_log
         where chat_activity_reward_log_id = #{chatActivityRewardLogId}
     </delete>
+
+    <select id="queryList" resultMap="TabHaobanGroupChatActivityRewardLogMap">
+        select
+        <include refid="Base_Column_List"></include>
+        from tab_haoban_group_chat_activity_reward_log
+        where delete_flag = 0
+        <if test="enterpriseId != null and enterpriseId != ''">
+            and enterprise_id = #{enterpriseId}
+        </if>
+        <if test="chatActivityId != null">
+            and chat_activity_id = #{chatActivityId}
+        </if>
+        <if test="memberId != null and memberId != ''">
+            and member_id = #{memberId}
+        </if>
+        order by create_time desc
+    </select>
 </mapper>
 

haoban-manage3-service/src/test/java/GroupChatInviteActivityTest.java

+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
-import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatActivityInviteLogQDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatActivityInviteLogApiService;
+import com.gic.haoban.manage.api.service.chat.GroupChatActivityRewardLogApiService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +25,9 @@ public class GroupChatInviteActivityTest {
     @Autowired
     private GroupChatActivityInviteLogApiService groupChatActivityInviteLogApiService;
 
+    @Autowired
+    private GroupChatActivityRewardLogApiService groupChatActivityRewardLogApiService;
+
     @Test
     public void queryMaxBatchInviteLog(){
         GroupChatActivityInviteLogQDTO inviteLogQDTO = new GroupChatActivityInviteLogQDTO();
@@ -30,6 +37,28 @@ public class GroupChatInviteActivityTest {
         inviteLogQDTO.setInviterMemberId("111");
         ServiceResponse<List<GroupChatActivityInviteLogDTO>> listServiceResponse = groupChatActivityInviteLogApiService.queryMaxBatchInviteLog(inviteLogQDTO);
         System.out.println(listServiceResponse.getResult());
+    }
+
+    @Test
+    public void queryInviteLogDetails(){
+        GroupChatActivityInviteLogQDTO inviteLogQDTO = new GroupChatActivityInviteLogQDTO();
+        inviteLogQDTO.setEnterpriseId("111");
+        inviteLogQDTO.setChatActivityId(1L);
+        inviteLogQDTO.setInviterMemberId("111");
+        inviteLogQDTO.setSortFiled("create_time");
+        inviteLogQDTO.setSortType("desc");
+        ServiceResponse<Page<GroupChatActivityInviteLogDTO>> listServiceResponse = groupChatActivityInviteLogApiService.queryInviteLogDetails(inviteLogQDTO);
+        System.out.println(listServiceResponse.getResult());
+    }
 
+    @Test
+    public void queryRewardLogDetails(){
+        GroupChatActivityRewardLogQDTO inviteLogQDTO = new GroupChatActivityRewardLogQDTO();
+        inviteLogQDTO.setEnterpriseId("111");
+        inviteLogQDTO.setChatActivityId(1L);
+        inviteLogQDTO.setMemberId("111");
+        ServiceResponse<Page<GroupChatActivityRewardLogDTO>> listServiceResponse = groupChatActivityRewardLogApiService.queryRewardLogDetails(inviteLogQDTO);
+        System.out.println(listServiceResponse.getResult());
     }
+
 }

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

+package com.gic.haoban.manage.web.vo.chat;
+
+import java.io.Serializable;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 13:48:42
+ */
+public class GroupChatDataInviterDetailVO implements Serializable {
+
+    private static final long serialVersionUID = -9115767612425777699L;
+
+    /**
+     * 活动id
+     */
+    private String chatActivityId;
+
+    /**
+     * 邀请进群人数
+     */
+    private String inviteeNum;
+
+    /**
+     * 有效邀请人数
+     */
+    private String effectiveInviteeNum;
+
+    /**
+     * 入群客户数
+     */
+    private String inviteeMemberNum;
+
+    /**
+     * 入群游客数
+     */
+    private String inviteeNonMemberNum;
+
+    /**
+     * 新增会员数
+     */
+    private String newMemberNum;
+
+    /**
+     * 发放积分数
+     */
+    private String integralCnt;
+
+    /**
+     * 发放成长值数
+     */
+    private String growCnt;
+
+    /**
+     * 发放卡券数
+     */
+    private String cardCnt;
+
+    /**
+     * 参与会员id
+     */
+    private String inviterMemberId;
+
+
+}

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

+package com.gic.haoban.manage.web.vo.chat;
+
+import java.io.Serializable;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 13:39:59
+ */
+public class GroupChatDataOverviewVO implements Serializable {
+
+    private static final long serialVersionUID = 8755443030113022176L;
+
+    /**
+     * 活动id
+     */
+    private String chatActivityId;
+
+    /**
+     * 分享人数
+     */
+    private String shareNum;
+
+    /**
+     * 参与人数
+     */
+    private String inviterNum;
+
+    /**
+     * 邀请进群人数
+     */
+    private String inviteeNum;
+
+    /**
+     * 有效邀请人数
+     */
+    private String effectiveInviteeNum;
+
+    /**
+     * 入群客户数
+     */
+    private String inviteeMemberNum;
+
+    /**
+     * 入群游客数
+     */
+    private String inviteeNonMemberNum;
+
+    /**
+     * 新增会员数
+     */
+    private String newMemberNum;
+
+    /**
+     * 发放积分数
+     */
+    private String integralCnt;
+
+    /**
+     * 发放成长值数
+     */
+    private String growCnt;
+
+    /**
+     * 发放卡券数
+     */
+    private String cardCnt;
+
+
+}

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

+package com.gic.haoban.manage.web.vo.chat;
+
+import java.io.Serializable;
+
+/**
+ * @author shangfeng
+ * @date 2024-10-09 13:44:27
+ */
+public class GroupChatDataRewardLevelVO implements Serializable {
+
+    private static final long serialVersionUID = -7250228098078933442L;
+
+    /**
+     * 活动id
+     */
+    private String chatActivityId;
+
+    /**
+     * 奖励阶梯
+     */
+    private String inviteLevel;
+
+    /**
+     * 阶梯达成人数
+     */
+    private String rewardNum;
+
+}