Merge remote-tracking branch 'origin/ferture/四月迭代需求'

Conflicts:
	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

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

@@ -69,6 +69,18 @@ public class GroupChatDTO implements Serializable {
     private int hmAddStatus = 1 ;
     private String chatRemark ;
     private int initFlag ;
+    private String clerkRelationExcel;
+    public String getClerkRelationExcel() {
+        if (clerkRelationFlag == 0){
+            clerkRelationExcel="未关联";
+        }else {
+            clerkRelationExcel="已关联";
+        }
+        return clerkRelationExcel;
+    }
+    public void setClerkRelationExcel(String clerkRelationExcel) {
+        this.clerkRelationExcel = clerkRelationExcel;
+    }
 
     public int getInitFlag() {
         return initFlag;

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

@@ -195,6 +195,7 @@ public interface ExternalClerkRelatedApiService {
     
     com.gic.api.base.commons.ServiceResponse<Boolean> isQwFriend(String enterpriseId, String staffId, String memberId) ;
 
+
     /**
      *
      * @param enterpriseId
@@ -204,10 +205,8 @@ public interface ExternalClerkRelatedApiService {
      */
     com.gic.api.base.commons.ServiceResponse<Boolean> isQwFriendWithUnionId(String enterpriseId, String clerkId, String unionId) ;
 
-    //无效接口
-//    com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId, String memberId) ;
+    List<String> listMemberAndStaff(List<String> memberIdList , String StaffId , String enterpriseId) ; 
 
-    List<String> listMemberAndClerk(List<String> memberIdList , List<String> clerkIdList , String enterpriseId) ; 
 
     /**
      * 批量查询会员与导购好友关系

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

@@ -146,14 +146,7 @@ public interface MemberUnionidRelatedApiService {
     
     ExternalUserDTO getCorpSelfExternalUseridInfoForMember(String wxEnterpriseId, String wxUserId, String externalUserId,String enterpriseId);
 
-    /**
-     * 添加企微好友关联关系表-无需触达
-     *
-     * @param dto
-     * @return
-     */
-    String addExternal(ExternalUserDTO dto);
-
+    public String dealMergeForReflsh(ExternalUserDTO externalUserDTO, String wxEnterpriseId , String staffId) ;
     /**
      * 获取客户详情-第三方
      *

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

@@ -186,7 +186,7 @@ public interface PreDealLogMapper {
      * @param relationKey
      * @return
      */
-    TabHaobanPreDealLog getByRelationKey(@Param("taskId") String taskId, @Param("dataType") int dataType, @Param("relationKey") String relationKey);
+    List<TabHaobanPreDealLog> getByRelationKey(@Param("taskId") String taskId, @Param("dataType") int dataType, @Param("relationKey") String relationKey);
 
     /**
      * 校验任务

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

@@ -374,6 +374,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
     
     void updateClerkInfo(@Param("staffId")String staffId, @Param("oldClerkId")String oldClerkId, @Param("newClerkId")String newClerkId, @Param("storeId")String storeId);
     
+    List<String> listByClerkId(@Param("staffId")String staffId, @Param("clerkId")String clerkId) ;
+    
     int updateExternalStatus(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("externalUserid")String externalUserid, @Param("status")int status);
     
     /**
@@ -382,6 +384,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
     TabHaobanExternalClerkRelated getMemberForExternalId(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("externalUserId") String externalUserId);
     
+    List<String> listMemberAndStaff(@Param("memberIdList")List<String> memberIdList, @Param("staffId")String staffId, @Param("enterpriseId")String enterpriseId);
+
     /**
      * 查询成员的好友列表
      */

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

@@ -9,7 +9,11 @@ public interface ClerkMainStoreRelatedService {
 
 	void setMainStore(String staffId, String storeId, String wxEnterpriseId);
 	
+	// 自动刷新好友列表
+	void reflushExternal(String wxEnterpriseId ,String staffId) ;
+	
 	TabHaobanClerkMainStoreRelated selectByWxEnterpriseIdAndStoreId(String staffId, String wxEnterpriseId);
+	TabHaobanClerkMainStoreRelated selectStaffMainStore(String staffId, String wxEnterpriseId);
 
 	/**
 	 * 获取主门店 如果没有主门店设置主门店

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

@@ -173,7 +173,7 @@ public interface PreDealService {
      * @param relationKey
      * @return
      */
-    public TabHaobanPreDealLog getByRelationKey(String taskId, Integer dataType, String relationKey);
+    public List<TabHaobanPreDealLog> getByRelationKey(String taskId, Integer dataType, String relationKey);
 
     /**
      * 获取任务是否有在同步中 好友

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

@@ -49,13 +49,17 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
     }
     
     @Override
+    public TabHaobanClerkMainStoreRelated selectStaffMainStore(String staffId, String wxEnterpriseId) {
+        return mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId, null);
+    }
+
+    @Override
     public void setMainStore(String staffId, String storeId, String wxEnterpriseId) {
         List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listManageBindByStaffId(staffId);
         if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
             logger.info("区经无需设置主门店：{}", staffId);
             return;
         }
-
         String uuId = com.gic.haoban.common.utils.StringUtil.randomUUID();
         Date now = new Date();
         TabHaobanClerkMainStoreRelated t = new TabHaobanClerkMainStoreRelated();
@@ -68,9 +72,10 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
         t.setFreshFriendFlag(1);
         t.setClerkMainStoreRelatedId(uuId);
         mapper.insert(t);
+    }
     
-        logger.info("切换主门店-刷新企业微信好友：{},{}", staffId, storeId);
-        //主门店切换需要刷新企业微信好友
+    @Override
+    public void reflushExternal(String wxEnterpriseId ,String staffId) {
         TabHaobanStaff staff = staffService.selectById(staffId);
         if (staff == null) {
             logger.info("员工不存在：{}", staffId);
@@ -79,21 +84,16 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
         String taskName = "自动刷新企业微信好友（" + staff.getStaffName() + "）";
         String taskId = dealSyncOperationApiService.createWxFriendTaskSingle(wxEnterpriseId, taskName, staffId, staff.getStaffName(), SyncTaskTypeEnum.FRIEND_SINGLE.getType());
         if (StringUtils.isBlank(taskId)) {
-            logger.info("刷新好友失败或正在刷新：{},{}", staffId, storeId);
+            logger.info("刷新好友失败或正在刷新：{},{}", staffId);
             return;
         }
         dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staffId, staffId, wxEnterpriseId);
-        logger.info("任务id：{}", taskId);
+        logger.info("开始自动刷新好友任务id={},staffId={}", taskId,staffId);
     }
 
     @Override
     public TabHaobanClerkMainStoreRelated getMainStoreByStaffId(String staffId, String wxEnterpriseId) {
-        TabHaobanClerkMainStoreRelated mainStoreRelated = mapper.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId, null);
-        if (null != mainStoreRelated) {
-            return mainStoreRelated;
-        }
-
-        return setStaffMainStore(staffId, wxEnterpriseId, null);
+       return this.getMainStoreByStaffId(staffId, wxEnterpriseId,null);
     }
 
     @Override

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

@@ -164,7 +164,7 @@ public class PreDealServiceImpl implements PreDealService {
     }
 
     @Override
-    public TabHaobanPreDealLog getByRelationKey(String taskId, Integer dataType, String relationKey) {
+    public List<TabHaobanPreDealLog> getByRelationKey(String taskId, Integer dataType, String relationKey) {
         return preDealLogMapper.getByRelationKey(taskId, dataType, relationKey);
     }
 

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

@@ -23,9 +23,10 @@ public class ClerkMainStoreRelatedApiServiceImpl implements ClerkMainStoreRelate
 	
 	@Override
 	public void setMainStore(String staffId, String storeId, String wxEnterpriseId) {
-		TabHaobanClerkMainStoreRelated related = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId);
+		TabHaobanClerkMainStoreRelated related = clerkMainStoreRelatedService.selectStaffMainStore(staffId, wxEnterpriseId);
         if (related == null) {
-            clerkMainStoreRelatedService.setMainStore(staffId, storeId, wxEnterpriseId);
+            this.clerkMainStoreRelatedService.setMainStore(staffId, storeId, wxEnterpriseId);
+            this.clerkMainStoreRelatedService.reflushExternal(wxEnterpriseId, staffId);
         } else if (null != related && (!related.getStoreId().equals(storeId))) {
             related.setStatusFlag(0);
 			related.setUpdateTime(new Date());

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

@@ -488,8 +488,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 //    }
     
     @Override
-    public List<String> listMemberAndClerk(List<String> memberIdList, List<String> clerkIdList, String enterpriseId) {
-        List<String> list = tabHaobanExternalClerkRelatedMapper.listMemberAndClerk(memberIdList, clerkIdList, enterpriseId);
+    public List<String> listMemberAndStaff(List<String> memberIdList, String staffId, String enterpriseId) {
+        List<String> list = tabHaobanExternalClerkRelatedMapper.listMemberAndStaff(memberIdList, staffId, enterpriseId);
         return list;
     }
 

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

@@ -15,6 +15,7 @@ import com.gic.haoban.manage.api.dto.CommonMQDTO;
 import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.WelcomeSendService;
+import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.quartz.api.dto.QuartzTaskDTO;
 import com.gic.quartz.api.service.QuartzService;
@@ -32,6 +33,8 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
     private StaffDepartmentRelatedService staffDepartmentRelatedService;
     @Autowired
     private WelcomeSendService welcomeSendService;
+    @Autowired
+    private MemberOpenCardBusinessService memberOpenCardBusinessService ;
 
     @Override
     public void putCommonMessage(CommonMQDTO dto) {
@@ -74,6 +77,13 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
             if (StringUtils.isNotBlank(staffId)) {
                 this.staffDepartmentRelatedService.repairStaffDepart(staffId);
             }
+            break ;
+        case 3:
+            String memberId = map.get("memberId") ;
+            enterpriseId = map.get("enterpriseId") ;
+            String clerkId = map.get("clerkId") ;
+            this.memberOpenCardBusinessService.memberClerkByQywx(enterpriseId, memberId, clerkId);
+            break ;
         default:
             break;
         }

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

@@ -199,6 +199,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             logger.info("该导购已经被被申请绑定，请审核处理后再绑定");
             return ServiceResponse.failure("4", "该导购已经被被申请绑定，请审核处理后再绑定");
         }
+        if (manageFlag == null || manageFlag == 0) {
             List<AuditDTO> list = auditApiService.listByStoreId(staffClerkRelationDTO.getStoreId());
             if (CollectionUtils.isNotEmpty(list)) {
                 Set<String> staffIds = list.stream().map(AuditDTO::getCommitStaffId).collect(Collectors.toSet());
@@ -217,6 +218,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
                 logger.info("该导购已绑定区经，不允许绑定导购");
                 return ServiceResponse.failure("3", "该导购已绑定区经，不允许绑定导购");
             }
+        }
         return null;
     }
 
@@ -540,11 +542,11 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
     // 导购门店转移
     private void moveOrAddClerk(ClerkSyncQDTO clerkSyncQDTO, StaffClerkRelationDTO oldRelationDTO) {
-        boolean flag = false;
+       /* boolean flag = false;
         if (null != RedisUtil.getCache("clerkMoveFlag2022")) {
             flag = true;
         }
-        if (flag) {
+        if (flag) {*/
             String oldClerkId = oldRelationDTO.getClerkId();
             this.staffClerkRelationService.delBind(oldClerkId, "-1", ChannelCodeEnum.SYNC_UNBIND.getCode(), clerkSyncQDTO.getClerkId(),oldRelationDTO.getWxEnterpriseId());
             // 设置新的ID
@@ -555,15 +557,15 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             if (response == null) {
                 this.staffClerkRelationService.insert(oldRelationDTO);
             }
-        } else {
+        /*} else {
             String oldClerkId = oldRelationDTO.getClerkId();
             this.staffClerkRelationService.delBind(oldClerkId, "-1", ChannelCodeEnum.SYNC_UNBIND.getCode(), null,null);
             // 设置新的ID
             oldRelationDTO.setClerkId(clerkSyncQDTO.getClerkId());
             oldRelationDTO.setStoreId(clerkSyncQDTO.getStoreId());
             ServiceResponse resp = this.bindStaffClerk(oldRelationDTO, "-1", ChannelCodeEnum.SYNC_BIND.getCode());
-            logger.info("绑定结果正常：{}，{}", JSONObject.toJSONString(resp), oldRelationDTO.getClerkId());
-        }
+            logger.info("绑定结果正常：{}，{}", JSONObject.toJSONString(resp), oldRelationDTO.getClerkId());*/
+       // }
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendClerkSyncNewOperation.java

@@ -56,7 +56,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
-        logger.info("dealParamMqDTO={},dataPre={}", JSON.toJSONString(dealParamMqDTO), JSON.toJSONString(dataPre));
+        logger.info("刷新好友列表（7-8),dealParamMqDTO={},dataPre={}", JSON.toJSONString(dealParamMqDTO), JSON.toJSONString(dataPre));
         String reason = "";
         boolean dealFlag = true;
         try {
@@ -82,7 +82,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
                 return;
             }
             if (CollectionUtils.isEmpty(selfUserIdList)) {
-                logger.info("改用户没有外部联系人：{}", JSONObject.toJSONString(dataPre));
+                logger.info("该用户无代开外部联系人：{}", JSONObject.toJSONString(dataPre));
                 dealFlag = false;
                 reason = "该用户没有外部联系人";
                 return;
@@ -100,7 +100,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
                 return;
             }
             if (CollectionUtils.isEmpty(userIdList)) {
-                logger.info("该用户没有外部联系人2：{}", JSONObject.toJSONString(dataPre));
+                logger.info("该用户无第三方外部联系人：{}", JSONObject.toJSONString(dataPre));
                 dealFlag = false;
                 reason = "该用户没有外部联系人";
                 return;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/SelfFriendSyncNewOperation.java

@@ -51,7 +51,7 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
-        logger.info("同步好友开始,自建代开发={}", JSONObject.toJSONString(dataPre));
+        logger.info("刷新好友列表7,代开发={}", JSONObject.toJSONString(dataPre));
         String reason = "成功";
         boolean dealFlag = true;
         try {
@@ -60,10 +60,10 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
             String staffId = dataPre.getpDataId() ;
             String taskId = dealParamMqDTO.getTaskId();
             String externalUserId = dataPre.getDataContent();
-
+            // 查询企微侧外部联系人详情
             ExternalUserDTO externalUserDTO = memberUnionidRelatedApiService.getCorpSelfExternalUseridInfo(wxEnterpriseId, wxUserId, externalUserId);
             if (externalUserDTO == null) {
-                logger.info("外部联系人好友不存在：{}", JSONObject.toJSONString(dataPre));
+                logger.info("代开发外部联系人详情查询失败,staffId={},{},{}", staffId,wxUserId,externalUserId);
                 dealException(taskId, dataPre.getDataId(), null, "好友不存在");
                 return;
             }
@@ -74,13 +74,11 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
             json.put("avatar", externalUserDTO.getAvatar());
             json.put("externalUserId", externalUserDTO.getExternalUserId());
             json.put("addCreateTime", externalUserDTO.getAddCreateTime());
-
-            //relationkey
-            logger.info("生成relationKey：{},{},{}",staffId,externalUserDTO.getName(),externalUserDTO.getAddCreateTime());
-            String relationKey = SecureUtil.md5(staffId + "_" + externalUserDTO.getName() + "_" + externalUserDTO.getAddCreateTime());
-            logger.info("relationKey：{}，{}", relationKey, externalUserDTO.getExternalUserId());
+            String str = staffId + "_" + externalUserDTO.getName() + "_" + externalUserDTO.getAddCreateTime() ;
+            String relationKey = SecureUtil.md5(str);
+            logger.info("生成代开发relationKey={},staff={},{}",relationKey,staffId,str);
             //更新状态
-            preDealService.updateFriendStatusByDataId(taskId, dataPre.getDataId(), PreDealStatusEnum.computed.getVal(), reason, json.toJSONString(), relationKey , PreDealTypeEnum.self_friend.getVal());
+            this.preDealService.updateFriendStatusByDataId(taskId, dataPre.getDataId(), PreDealStatusEnum.computed.getVal(), reason, json.toJSONString(), relationKey , PreDealTypeEnum.self_friend.getVal());
             dealSuccess(taskId, dataPre.getDataId(), null, wxEnterpriseId);
         } catch (WxApiLimitException e) {
             logger.info("接口次数限制：{}", JSONObject.toJSONString(dataPre));

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -745,6 +745,13 @@
           and status_flag in (1,3,4) 
 	</update>
 	
+	<select id="listByClerkId" resultType="String">
+		select member_id from tab_haoban_external_clerk_related 
+		 where staff_id = #{staffId}
+          and clerk_id = #{clerkId}
+          and status_flag = 1
+	</select>
+	
 	<update id="updateExternalStatus">
 		update tab_haoban_external_clerk_related set external_status = #{status} where 
 		external_user_id = #{externalUserid} and wx_enterprise_id = #{wxEnterpriseId}
@@ -774,4 +781,16 @@
             </foreach>
     </select>
 
+	<select id="listMemberAndStaff"  resultType="java.lang.String">
+    	 select member_id
+        from tab_haoban_external_clerk_related
+        where member_id in
+        <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and staff_id = #{staffId}
+        and enterprise_id = #{enterpriseId}
+        AND status_flag = 1 
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -374,11 +374,13 @@ public class StaffController extends WebBaseController {
                         }
                     }
                     StoreDTO store = storeService.getStore(clerkInfoVo.getStoreId());
-                    if (null != store) {
+                    if (null != store && store.getStatus() != -3) {
                         clerkInfoVo.setStoreName(store.getStoreName());
-
                     }
                 });
+                if (manageFlag == null || manageFlag != 1) {
+                    retList = retList.stream().filter(o->StringUtils.isNotEmpty(o.getStoreName())).collect(Collectors.toList()) ;
+                }
             }
         }
         return resultResponse(HaoBanErrCode.ERR_1, retList);

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

 package com.gic.haoban.manage.web.controller.chat;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.ExcelUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.StaffDTO;
@@ -28,11 +20,26 @@ import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
 import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  *
@@ -52,6 +59,8 @@ public class GroupChatController {
     private GroupChatApiService groupChatApiService;
     @Autowired
     private StaffApiService staffApiService;
+    @Autowired
+    private EnterpriseService enterpriseService;
 
     @RequestMapping("get-set-gic-flag")
     public RestResponse<Object> getFlag() {
@@ -204,5 +213,52 @@ public class GroupChatController {
         GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
         return RestResponse.successResult(resp.getResult());
     }
+    /**
+     * 客户群列表数据明细导出
+     */
+    @RequestMapping("customer-group-export")
+    public RestResponse<Boolean> customerGroupExport(HttpServletRequest request, HttpServletResponse response,GroupChatSearchQDTO qdto) {
+        // 登录校验
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        if (loginUser == null || StringUtils.isBlank(loginUser.getEnterpriseId())) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
+        }
+        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";
+        }
+        BasePageInfo basePageInfo = new BasePageInfo() ;
+        basePageInfo.setPageNum(1);
+        basePageInfo.setPageSize(99999);
+        qdto.setSortColumn(sortColumn);
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
+        if (page.isSuccess() && CollUtil.isNotEmpty(page.getResult().getResult())){
+            String fileName = "客户群列表数据";
+            List<String> titleList = Arrays.asList("客户群ID", "客户群名称", "群人数", "群客户数", "新增总数", "流失总数","群主","群主在好办小程序关联状态","创建时间");
+            List<String> fileList = Arrays.asList("groupChatId", "name", "totalCount", "totalMemberCount", "addCount", "quitCount", "staffName", "clerkRelationExcel", "createTime");
+            try {
+                ExcelUtils.xls(response, request, fileName, page.getResult().getResult(), fileList, titleList);
+            } catch (Exception e) {
+                e.printStackTrace();
+                logger.info("导出失败");
+            }
+            return RestResponse.successResult(true);
+        }
+        return RestResponse.successResult(false);
+    }
 
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -186,9 +186,13 @@ public class WxStaffController extends WebBaseController {
         List<StaffVO> resultList = new ArrayList<>();
         for (StaffDTO staffDTO : resultlist) {
             String enterpriseId = staffDTO.getEnterpriseId();
-            long memberCount = distributeApiService.getClerkMemberCount(enterpriseId, staffDTO.getClerkId(), storeId);
-            logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", enterpriseId,
-                    staffDTO.getClerkId(), storeId, memberCount);
+            String staffClerkId = staffDTO.getClerkId() ;
+            ClerkDTO clerk = this.clerkService.getclerkById(staffClerkId) ;
+            if(null != clerk) {
+                staffDTO.setStaffName(clerk.getClerkName());
+            }
+            long memberCount = customerApiService.countMember(enterpriseId, storeId, staffDTO.getClerkId());
+            logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", enterpriseId, staffDTO.getClerkId(), storeId, memberCount);
             staffDTO.setMemberCount(Convert.toInt(memberCount, 0));
             resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO));
         }
@@ -631,15 +635,7 @@ public class WxStaffController extends WebBaseController {
     @HttpLimit
     @RequestMapping("/check-main-store")
     public HaobanResponse checkMainStore(String staffId, String storeId, String wxEnterpriseId, String dateStr) {
-        StaffDTO staff = staffApiService.selectById(staffId);
         Date curDate = new Date();
-        if (staff == null) {
-            return resultResponse(HaoBanErrCode.ERR_10006);
-        }
-        // 给测试使用
-        if (StringUtils.isNotBlank(dateStr)) {
-            curDate = cn.hutool.core.date.DateUtil.parse(dateStr);
-        }
         int i = cn.hutool.core.date.DateUtil.weekOfYear(curDate);
         String key = "haoban_set_main_store_" + i + ":" + staffId;
         Object hasSet = RedisUtil.getCache(key);