群的查询

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

@@ -56,16 +56,36 @@ public class GroupChatDTO implements Serializable {
     private String staffName;
     private String staffImage;
     private String originalStaffId;
-    private String originalStaffName ;
+    private String originalStaffName;
     private Date offTime;
     // 1已关联导购 0未关联导购
     private int clerkRelationFlag = 0;
     private int openConcatFlag = 0;
+    // 群主未激活、开通联系我说明
+    private String ownerRemark;
+    // 群主所有群能加到活码标识1可以0不可以
+    private int ownerAddFlag = 1;
+
+    public String getOwnerRemark() {
+        return ownerRemark;
+    }
 
     public String getOriginalStaffName() {
         return originalStaffName;
     }
 
+    public int getOwnerAddFlag() {
+        return ownerAddFlag;
+    }
+
+    public void setOwnerRemark(String ownerRemark) {
+        this.ownerRemark = ownerRemark;
+    }
+
+    public void setOwnerAddFlag(int ownerAddFlag) {
+        this.ownerAddFlag = ownerAddFlag;
+    }
+
     public void setOriginalStaffName(String originalStaffName) {
         this.originalStaffName = originalStaffName;
     }

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

@@ -27,6 +27,16 @@ public class GroupChatSearchQDTO implements Serializable {
     private String sortType = "desc" ;
     // 群列表页需要显示未关联gic商户的
     private boolean chatPageFlag = false ;
+    // 0全部 1未满200 2已满200
+    private Integer hmAddStatus ;
+    
+    public Integer getHmAddStatus() {
+        return hmAddStatus;
+    }
+
+    public void setHmAddStatus(Integer hmAddStatus) {
+        this.hmAddStatus = hmAddStatus;
+    }
 
     public boolean isChatPageFlag() {
         return chatPageFlag;

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

@@ -92,7 +92,18 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
 
     @Override
     public void discard(Long chatHmId, String wxEnterpriseId, String clerkId, String clerkName) {
+        TabGroupChatHm hm = this.groupChatHmMapper.selectById(chatHmId);
         this.groupChatHmMapper.discard(chatHmId, wxEnterpriseId, clerkId, clerkName);
+        if (StringUtils.isNotBlank(hm.getWxConfigId())) {
+            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId,
+                    SecretTypeEnum.CUSTOMIZED_APP.getVal());
+            if (null != secretSetting) {
+                WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+                ServiceResponse<Void> resp = this.qywxChatApiService.delJoinWay(qwDTO.getDkCorpid(),
+                        secretSetting.getSecretVal(), hm.getWxConfigId());
+                logger.info("删除群活码={}", JSON.toJSON(resp));
+            }
+        }
     }
 
     @Override

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.out.impl.chat;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -58,32 +59,38 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
         if (null != qdto.getEndDate()) {
             qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
         }
-        String sortColumn = qdto.getSortColumn();
-        if (StringUtils.isBlank(sortColumn)) {
-            sortColumn = null;
-        } else if ("totalCount".equals(sortColumn)) {
-            sortColumn = "total_count";
-        } else if ("totalMemberCount".equals(sortColumn)) {
-            sortColumn = "total_member_count";
-        } else if ("addMemberCount".equals(sortColumn)) {
-            sortColumn = "add_member_count";
-        } else if ("addCount".equals(sortColumn)) {
-            sortColumn = "add_count";
-        } else if ("quitCount".equals(sortColumn)) {
-            sortColumn = "quit_count";
-        } else if ("quitMemberCount".equals(sortColumn)) {
-            sortColumn = "quit_member_count";
-        }
-        qdto.setSortColumn(sortColumn);
         Page<GroupChatDTO> page = this.groupChatService.listPage(qdto, basePageInfo);
         Page<GroupChatDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatDTO.class);
         List<GroupChatDTO> dtoList = resultPage.getResult();
         // 处理关联状态
         if (CollectionUtils.isNotEmpty(dtoList)) {
-            boolean needClerkReltaion = (qdto.getStatus() == 0);
-            if (needClerkReltaion) {
+            // 处理群主状态
             List<String> staffIdList = dtoList.stream().filter(dto -> StringUtils.isNotBlank(dto.getStaffId()))
                     .map(dto -> dto.getStaffId()).collect(Collectors.toList());
+            List<TabHaobanStaff> staffList = this.staffService.listNoStatusByStaffIds(qdto.getWxEnterpriseId(),
+                    staffIdList);
+            Map<String, TabHaobanStaff> map = staffList.stream()
+                    .collect(Collectors.toMap(TabHaobanStaff::getStaffId, o -> o, (k1, k2) -> k2));
+            dtoList.forEach(one -> {
+                TabHaobanStaff staff = map.get(one.getStaffId());
+                Integer activiveFlag = staff.getActiveFlag();
+                Integer openConcatFlag = staff.getOpenConcatFlag();
+                String reamrk = null ;
+                Integer ownerAddFlag = 1 ;
+                if (activiveFlag == 0) {
+                    ownerAddFlag = 0 ;
+                    reamrk = "群主未激活" ;
+                }
+                if (openConcatFlag == 0) {
+                    ownerAddFlag = 0 ;
+                    reamrk = "群主未配置客户联系功能" ;
+                }
+                one.setOwnerRemark(reamrk);
+                one.setOwnerAddFlag(ownerAddFlag);
+            });
+            // 处理关联关系
+            boolean needClerkReltaion = (qdto.getStatus() == 0);
+            if (needClerkReltaion) {
                 List<String> relationIdList = this.staffClerkRelationService
                         .listRelationsStaffId(new HashSet<>(staffIdList));
                 dtoList.forEach(one -> {

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

@@ -273,6 +273,9 @@
 		<if test="null != status and 4==status">
 			and a.chat_status = 4
 		</if>
+		<if test="null != hmAddStatus and 0!=hmAddStatus">
+			and a.hm_add_status = #{hmAddStatus}
+		</if>
 		<if test="null != searchParams and ''!=searchParams ">
 			and (a.name like '%${searchParams}%' or a.wx_chat_id like '${searchParams}%')
 		</if>

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

@@ -77,10 +77,28 @@ public class GroupChatController {
     @RequestMapping("page")
     public RestResponse<Object> page(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String sortColumn = qdto.getSortColumn();
+        if (StringUtils.isBlank(sortColumn)) {
+            sortColumn = null;
+        } else if ("totalCount".equals(sortColumn)) {
+            sortColumn = "total_count";
+        } else if ("totalMemberCount".equals(sortColumn)) {
+            sortColumn = "total_member_count";
+        } else if ("addMemberCount".equals(sortColumn)) {
+            sortColumn = "add_member_count";
+        } else if ("addCount".equals(sortColumn)) {
+            sortColumn = "add_count";
+        } else if ("quitCount".equals(sortColumn)) {
+            sortColumn = "quit_count";
+        } else if ("quitMemberCount".equals(sortColumn)) {
+            sortColumn = "quit_member_count";
+        }
+        qdto.setSortColumn(sortColumn);
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
         qdto.setChatPageFlag(true);
         ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
+        
         return RestResponse.successResult(page.getResult());
     }
 

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

 package com.gic.haoban.manage.web.vo.chat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 
@@ -51,165 +52,249 @@ public class GroupChatVO implements Serializable {
     /**gic企业ID*/
     private String enterpriseId;
     /**gic侧状态1可用,2不可用*/
-    private Integer statusFlag;
-
-    public void setGroupChatId(Long groupChatId) {
-        this.groupChatId = groupChatId;
-    }
+    private Integer gicFlag;
+    private String staffName;
+    private String staffImage;
+    private String originalStaffId;
+    private String originalStaffName;
+    private Date offTime;
+    // 1已关联导购 0未关联导购
+    private int clerkRelationFlag = 0;
+    private int openConcatFlag = 0;
+    // 群主未激活、开通联系我说明
+    private String ownerRemark;
+    // 群主所有群能加到活码标识1可以0不可以
+    private String ownerAddFlag;
 
     public Long getGroupChatId() {
         return groupChatId;
     }
 
-    public void setWxEnterpriseId(String wxEnterpriseId) {
-        this.wxEnterpriseId = wxEnterpriseId;
-    }
-
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void setStaffId(String staffId) {
-        this.staffId = staffId;
-    }
-
     public String getStaffId() {
         return staffId;
     }
 
-    public void setWxChatId(String wxChatId) {
-        this.wxChatId = wxChatId;
-    }
-
     public String getWxChatId() {
         return wxChatId;
     }
 
-    public void setChatAddTime(java.util.Date chatAddTime) {
-        this.chatAddTime = chatAddTime;
-    }
-
     public java.util.Date getChatAddTime() {
         return chatAddTime;
     }
 
-    public void setChatDissolveTime(java.util.Date chatDissolveTime) {
-        this.chatDissolveTime = chatDissolveTime;
-    }
-
     public java.util.Date getChatDissolveTime() {
         return chatDissolveTime;
     }
 
-    public void setChatNotice(String chatNotice) {
-        this.chatNotice = chatNotice;
-    }
-
     public String getChatNotice() {
         return chatNotice;
     }
 
-    public void setChatStatus(Integer chatStatus) {
-        this.chatStatus = chatStatus;
-    }
-
     public Integer getChatStatus() {
         return chatStatus;
     }
 
-    public void setCreateTime(java.util.Date createTime) {
-        this.createTime = createTime;
-    }
-
     public java.util.Date getCreateTime() {
         return createTime;
     }
 
-    public void setUpdateTime(java.util.Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
     public java.util.Date getUpdateTime() {
         return updateTime;
     }
 
-    public void setDeleteFlag(Integer deleteFlag) {
-        this.deleteFlag = deleteFlag;
-    }
-
     public Integer getDeleteFlag() {
         return deleteFlag;
     }
 
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
     public Integer getTotalCount() {
         return totalCount;
     }
 
-    public void setTotalMemberCount(Integer totalMemberCount) {
-        this.totalMemberCount = totalMemberCount;
-    }
-
     public Integer getTotalMemberCount() {
         return totalMemberCount;
     }
 
-    public void setAddMemberCount(Integer addMemberCount) {
-        this.addMemberCount = addMemberCount;
-    }
-
     public Integer getAddMemberCount() {
         return addMemberCount;
     }
 
-    public void setAddCount(Integer addCount) {
-        this.addCount = addCount;
-    }
-
     public Integer getAddCount() {
         return addCount;
     }
 
-    public void setQuitCount(Integer quitCount) {
-        this.quitCount = quitCount;
-    }
-
     public Integer getQuitCount() {
         return quitCount;
     }
 
-    public void setQuitMemberCount(Integer quitMemberCount) {
-        this.quitMemberCount = quitMemberCount;
-    }
-
     public Integer getQuitMemberCount() {
         return quitMemberCount;
     }
 
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public Integer getGicFlag() {
+        return gicFlag;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public String getStaffImage() {
+        return staffImage;
+    }
+
+    public String getOriginalStaffId() {
+        return originalStaffId;
+    }
+
+    public String getOriginalStaffName() {
+        return originalStaffName;
+    }
+
+    public Date getOffTime() {
+        return offTime;
+    }
+
+    public int getClerkRelationFlag() {
+        return clerkRelationFlag;
+    }
+
+    public int getOpenConcatFlag() {
+        return openConcatFlag;
+    }
+
+    public String getOwnerRemark() {
+        return ownerRemark;
+    }
+
+    public String getOwnerAddFlag() {
+        return ownerAddFlag;
+    }
+
+    public void setGroupChatId(Long groupChatId) {
+        this.groupChatId = groupChatId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public void setWxChatId(String wxChatId) {
+        this.wxChatId = wxChatId;
+    }
+
+    public void setChatAddTime(java.util.Date chatAddTime) {
+        this.chatAddTime = chatAddTime;
+    }
+
+    public void setChatDissolveTime(java.util.Date chatDissolveTime) {
+        this.chatDissolveTime = chatDissolveTime;
+    }
+
+    public void setChatNotice(String chatNotice) {
+        this.chatNotice = chatNotice;
+    }
+
+    public void setChatStatus(Integer chatStatus) {
+        this.chatStatus = chatStatus;
+    }
+
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public void setUpdateTime(java.util.Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public void setTotalMemberCount(Integer totalMemberCount) {
+        this.totalMemberCount = totalMemberCount;
+    }
+
+    public void setAddMemberCount(Integer addMemberCount) {
+        this.addMemberCount = addMemberCount;
+    }
+
+    public void setAddCount(Integer addCount) {
+        this.addCount = addCount;
+    }
+
+    public void setQuitCount(Integer quitCount) {
+        this.quitCount = quitCount;
+    }
+
+    public void setQuitMemberCount(Integer quitMemberCount) {
+        this.quitMemberCount = quitMemberCount;
+    }
+
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
 
-    public String getEnterpriseId() {
-        return enterpriseId;
+    public void setGicFlag(Integer gicFlag) {
+        this.gicFlag = gicFlag;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public void setStaffImage(String staffImage) {
+        this.staffImage = staffImage;
+    }
+
+    public void setOriginalStaffId(String originalStaffId) {
+        this.originalStaffId = originalStaffId;
+    }
+
+    public void setOriginalStaffName(String originalStaffName) {
+        this.originalStaffName = originalStaffName;
+    }
+
+    public void setOffTime(Date offTime) {
+        this.offTime = offTime;
+    }
+
+    public void setClerkRelationFlag(int clerkRelationFlag) {
+        this.clerkRelationFlag = clerkRelationFlag;
+    }
+
+    public void setOpenConcatFlag(int openConcatFlag) {
+        this.openConcatFlag = openConcatFlag;
     }
 
-    public void setStatusFlag(Integer statusFlag) {
-        this.statusFlag = statusFlag;
+    public void setOwnerRemark(String ownerRemark) {
+        this.ownerRemark = ownerRemark;
     }
 
-    public Integer getStatusFlag() {
-        return statusFlag;
+    public void setOwnerAddFlag(String ownerAddFlag) {
+        this.ownerAddFlag = ownerAddFlag;
     }
 }
\ No newline at end of file