Merge remote-tracking branch 'origin/master_xgh_企微安全升级' into developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterprise.java
	haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

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

@@ -11,8 +11,6 @@ public class WxEnterpriseDTO implements Serializable {
 
     private String wxEnterpriseId;
 
-    private String corpid;
-
     private String permanentCode;
 
     private String corpName;
@@ -107,6 +105,33 @@ public class WxEnterpriseDTO implements Serializable {
     private Integer autoActiveFlag;
 
     private String enterpriseId;
+    private Integer wxSecurityType ;
+    private String wxCorpid ;
+    private String openCorpid ;
+
+    public Integer getWxSecurityType() {
+        return wxSecurityType;
+    }
+
+    public void setWxSecurityType(Integer wxSecurityType) {
+        this.wxSecurityType = wxSecurityType;
+    }
+
+    public String getWxCorpid() {
+        return wxCorpid;
+    }
+
+    public String getOpenCorpid() {
+        return openCorpid;
+    }
+
+    public void setWxCorpid(String wxCorpid) {
+        this.wxCorpid = wxCorpid;
+    }
+
+    public void setOpenCorpid(String openCorpid) {
+        this.openCorpid = openCorpid;
+    }
 
     public String getMemberSecret() {
         return memberSecret;
@@ -132,14 +157,6 @@ public class WxEnterpriseDTO implements Serializable {
         this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
     }
 
-    public String getCorpid() {
-        return corpid;
-    }
-
-    public void setCorpid(String corpid) {
-        this.corpid = corpid == null ? null : corpid.trim();
-    }
-
     public String getPermanentCode() {
         return permanentCode;
     }

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

@@ -6,19 +6,22 @@ public class WxEnterpriseQwDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private int wxSecurityType ;
+    private int wxSecurityType;
     private String wxEnterpriseId;
-    // 企业表中的id(正常同第三方)
-    private String corpid;
     // 好办 助手
     private String dkCorpid;
-    private String dkSuiteId ;
+    private String dkSuiteId;
     // 会员小程序dk
     private String memberCorpid;
-    private String memberSuiteId ;
+    private String memberSuiteId;
     // 第三方
     private String thirdCorpid;
     
+    // 第三方使用的加密的userid
+    public boolean needOpenUserId3th() {
+        return this.wxSecurityType == 2 || this.wxSecurityType == 3;
+    }
+
     public String getDkSuiteId() {
         return dkSuiteId;
     }
@@ -47,10 +50,6 @@ public class WxEnterpriseQwDTO implements Serializable {
         return wxEnterpriseId;
     }
 
-    public String getCorpid() {
-        return corpid;
-    }
-
     public String getDkCorpid() {
         return dkCorpid;
     }
@@ -67,10 +66,6 @@ public class WxEnterpriseQwDTO implements Serializable {
         this.wxEnterpriseId = wxEnterpriseId;
     }
 
-    public void setCorpid(String corpid) {
-        this.corpid = corpid;
-    }
-
     public void setDkCorpid(String dkCorpid) {
         this.dkCorpid = dkCorpid;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SecretTypeEnum.java

@@ -5,10 +5,6 @@ package com.gic.haoban.manage.api.enums;
  */
 public enum SecretTypeEnum {
     CONTACT_CUSTOMER(1, "顾客联系"),
-    // 2和3废弃
-    CONTACT_SECRET(2, "通讯录"),
-    // 3和5公用
-    HAOBAN_HELP(3, "好办助手"),
     MEMBER_WAPP(4, "会员小程序"),
     CUSTOMIZED_APP(5, "自建代开发"),
     WEWORK_PAY(6, "企业支付"),

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

@@ -54,12 +54,6 @@ public interface DepartmentApiService {
 	 * @return
 	 */
 	DepartmentDTO selectByRelatedId(String departId);
-	/**
-	 * 放入回收站
-	 * @param departmentId
-	 * @return
-	 */
-	ServiceResponse recycle(String departmentId);
 	
 	/**
 	 * 根据参数查询
@@ -72,11 +66,7 @@ public interface DepartmentApiService {
 	 */
 	Page<DepartmentDTO> pageDepartmentByParams(BasePageInfo pageInfo, String wxEnterpriseId, String keyword,
 			Integer storeFlag, Integer recycleFlag);
-	/**
-	 * 回收站恢复
-	 * @param departmentId
-	 */
-	ServiceResponse repairRecycle(String departmentId,String parentId);
+
 	/**
 	 * 获取根节点
 	 * @param wxEnterpriseId

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

@@ -11,24 +11,17 @@ public interface StaffApiService {
 
     StaffDTO selectById(String staffId);
 
-    StaffDTO selectSuperByWxEnterpriseId(String wxEnterpriseId);
-
     List<StaffDTO> listByIds(List<String> staffIds);
 
     List<StaffDTO> listByWxUserId(String wxUserId, String wxEnterpriseId);
 
     StaffDTO selectByNationcodeAndPhoneNumber(String wxEnterpriseId, String nationcode, String phoneNumber);
 
-    ServiceResponse add(StaffDTO staff, String departmentIds);
-
     List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
 
     Page<StaffDTO> pageStaff(List<String> departmentId, Integer activeFlag,
                              String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId);
 
-    @Deprecated
-    void del(String staffDepartmentStaffRelatedId);
-
     /**
      * 保存微信成员
      *
@@ -76,23 +69,12 @@ public interface StaffApiService {
 
     StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
 
-    int countByDepartmentId(String departmentId);
-
-    @Deprecated
-    void syncGicClerk(String fieldListString);
-
-    @Deprecated
-    void addGicClerk(GicClerkDTO clerkDTO);
-
     StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
 
     void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId, String taskId);
 
     List<String> listUnBindClerk(String storeId);
 
-    @Deprecated
-    void cleanGicClerk(String clerkCode, String departmentId);
-
     String insertUserLoginLog(UserLoginLogDTO userLoginLogDTO);
 
     int countByDepartmentIds(List<String> departmentIds);
@@ -102,14 +84,6 @@ public interface StaffApiService {
     List<StaffDTO> listByUserIdsAndWxEnterpriseId(List<String> userIds, String wxEnterpriseId);
 
     /**
-     * 保存gic成员
-     *
-     * @param clerkDTO
-     * @return
-     */
-    ServiceResponse saveSyncStaffByGic(GicClerkDTO clerkDTO);
-
-    /**
      * 获取成员头像
      *
      * @param clerkCode
@@ -141,15 +115,6 @@ public interface StaffApiService {
     StaffDTO getWxStaffOne(String wxEnterpriseId);
 
     /**
-     * 获取超管
-     *
-     * @param wxEnterpriseId
-     * @return
-     */
-    StaffDTO getAndAddSupperAdmin(String wxEnterpriseId);
-
-
-    /**
      * 是否隐私
      *
      * @param staffId 员工id

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

@@ -46,6 +46,8 @@ public interface WxEnterpriseApiService {
      */
     WxEnterpriseDTO getOne(String wxEnterpriseId);
     
+    WxEnterpriseQwDTO getQwInfo(String wxEnterpriseId);
+
     /**
      * 根据corpId查询一条数据
      *

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestDataImportController.java

@@ -41,15 +41,6 @@ public class TestDataImportController extends WebBaseController {
     private static final Logger logger = getLogger(TestDataImportController.class);
 
     @Autowired
-    private StaffApiService staffApiService;
-
-    @Autowired
-    private StaffClerkRelationApiService staffClerkRelationApiService;
-
-    @Autowired
-    private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
-
-    @Autowired
     private IMarketClueTaskApiService iMarketClueTaskApiService;
 
     @Autowired
@@ -57,63 +48,6 @@ public class TestDataImportController extends WebBaseController {
    
 
     /**
-     * 导入会员好友
-     *
-     * @param qo
-     * @return
-     */
-    @RequestMapping("/friend-import")
-    public HaobanResponse importFriend(ImportMemberQo qo) {
-        if (StringUtils.isAnyBlank(qo.getClerkCode(), qo.getClerkId(), qo.getDepartmentId(), qo.getEnterpriseId(), qo.getMemberId()
-                , qo.getPhoneNumber(), qo.getStoreId(), qo.getUnionid(), qo.getWxEnterpriseId())) {
-            return resultResponse(HaoBanErrCode.ERR_2);
-        }
-        StaffDTO staffDTO = staffApiService.selectByUserIdAndEnterpriseId(qo.getWxUserId(), qo.getWxEnterpriseId());
-        if (null == staffDTO) {
-            StaffDTO staff = new StaffDTO();
-            staff.setPhoneNumber(qo.getPhoneNumber());
-            staff.setWxUserId(qo.getWxUserId());
-            staff.setWxEnterpriseId(qo.getWxEnterpriseId());
-            staff.setStaffName(qo.getClerkCode());
-            staff.setSex(1);
-            staff.setNationCode("86");
-            staff.setActiveFlag(1);
-            ServiceResponse add = staffApiService.add(staff, qo.getDepartmentId());
-            if (add.getCode() == 1) {
-                staffDTO = staffApiService.selectById(add.getResult().toString());
-            }
-        }
-        StaffClerkRelationDTO clerkRelationDTO = staffClerkRelationApiService.getOneByStoreIdAndStaffId(qo.getStoreId(), staffDTO.getStaffId());
-        if (clerkRelationDTO == null) {
-            StaffClerkRelationDTO staffClerkRelationDTO = new StaffClerkRelationDTO();
-            staffClerkRelationDTO.setStoreId(qo.getStoreId());
-            staffClerkRelationDTO.setClerkId(qo.getClerkId());
-            staffClerkRelationDTO.setClerkCode(qo.getClerkCode());
-            staffClerkRelationDTO.setWxUserId(staffDTO.getWxUserId());
-            staffClerkRelationDTO.setStaffId(staffDTO.getStaffId());
-            staffClerkRelationDTO.setWxEnterpriseId(qo.getWxEnterpriseId());
-            staffClerkRelationDTO.setEnterpriseId(qo.getEnterpriseId());
-            ServiceResponse response = staffClerkRelationApiService.bindStaffClerk(staffClerkRelationDTO, "-1", ChannelCodeEnum.ADMIN_BIND.getCode());
-        }
-        //新增好友
-        ExternalUserDTO dto = new ExternalUserDTO();
-        dto.setUnionId(qo.getUnionid());
-        dto.setWxUserId(qo.getWxUserId());
-        dto.setWxEnterpriseId(qo.getWxEnterpriseId());
-        dto.setMemberId(qo.getMemberId());
-        dto.setExternalUserId(qo.getMemberId());
-        dto.setClerkId(qo.getClerkId());
-        dto.setStoreId(qo.getStoreId());
-        dto.setEnterpriseId(qo.getEnterpriseId());
-        dto.setName("测试会员" + RandomUtil.getRandomString(5));
-        dto.setStaffId(staffDTO.getStaffId());
-        dto.setAddCreateTime(Long.valueOf(System.currentTimeMillis() / 1000).toString());
-        memberUnionidRelatedApiService.addExternal(dto);
-
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
-    /**
      * 处理任务
      *
      * @param ecmId           计划id

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

@@ -32,8 +32,6 @@ public interface StaffDepartmentRelatedMapper {
 
 	TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(@Param("departmentId")String departmentId, @Param("staffId")String staffId);
 
-	int countByDepartmentId(@Param("departmentId")String departmentId);
-
 	TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
 
 	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentIds")List<String> departmentIds, @Param("keyword")String keyword);

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

@@ -42,8 +42,6 @@ public interface StaffMapper {
     TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId") String userId,
                                                  @Param("wxEnterpriseId") String wxEnterpriseId);
 
-    TabHaobanStaff selectSuperByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
-
     List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber") String phoneNumber);
 
     List<TabHaobanStaff> listByUserIdsAndWxEnterpriseId(@Param("userIds") List<String> userIds, @Param("wxEnterpriseId") String wxEnterpriseId);

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

@@ -9,8 +9,6 @@ public class TabHaobanWxEnterprise implements Serializable {
 
     private String wxEnterpriseId;
 
-    private String corpid;
-
     private String permanentCode;
 
     private String corpName;
@@ -87,9 +85,28 @@ public class TabHaobanWxEnterprise implements Serializable {
      */
     private Integer externalFlag;
     private Integer useridFlag;
-    private Integer wxSecurityType;
     private Integer autoActiveFlag;
 
+    private Integer wxSecurityType ;
+    
+    private String wxCorpid ;
+    private String openCorpid ;
+
+    public String getWxCorpid() {
+        return wxCorpid;
+    }
+
+    public String getOpenCorpid() {
+        return openCorpid;
+    }
+
+    public void setWxCorpid(String wxCorpid) {
+        this.wxCorpid = wxCorpid;
+    }
+
+    public void setOpenCorpid(String openCorpid) {
+        this.openCorpid = openCorpid;
+    }
 
     public Integer getWxSecurityType() {
         return wxSecurityType;
@@ -115,14 +132,6 @@ public class TabHaobanWxEnterprise implements Serializable {
         this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
     }
 
-    public String getCorpid() {
-        return corpid;
-    }
-
-    public void setCorpid(String corpid) {
-        this.corpid = corpid == null ? null : corpid.trim();
-    }
-
     public String getPermanentCode() {
         return permanentCode;
     }

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

@@ -21,8 +21,6 @@ public interface StaffDepartmentRelatedService {
 
 	TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(String departmentId, String staffId);
 
-	int countByDepartmentId(String departmentId);
-
 	/**
 	 * 效率很低
 	 * @param departmentId

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

@@ -37,9 +37,6 @@ public interface WxEnterpriseService {
 
 	int unbind(String wxEnterpriseId);
 
-	TabHaobanWxEnterprise getEnterpriseBycorpIdNoStatus(String corpid);
-
-
 	/**
 	 * 得到企业bycorp名称
 	 *

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

 package com.gic.haoban.manage.service.service.impl;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.ToolUtil;
@@ -8,13 +22,24 @@ import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.HandoverExternalDTO;
 import com.gic.haoban.manage.api.dto.HandoverStaffFriendCountDTO;
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.dao.mapper.*;
-import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.dao.mapper.HandoverExternalMapper;
+import com.gic.haoban.manage.service.dao.mapper.HandoverStaffMapper;
+import com.gic.haoban.manage.service.dao.mapper.HandoverTransferMapper;
+import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanClerkMainStoreRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabHandoverExternal;
+import com.gic.haoban.manage.service.entity.TabHandoverStaff;
+import com.gic.haoban.manage.service.entity.TabHandoverTransfer;
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.service.HandoverService;
 import com.gic.haoban.manage.service.service.SecretSettingService;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.wechat.api.dto.qywx.QywxTransferCustomerInfoDTO;
 import com.gic.wechat.api.dto.qywx.QywxUnassignedInfoDTO;
 import com.gic.wechat.api.dto.qywx.UserDTO;
@@ -22,15 +47,6 @@ import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Sets;
-import org.apache.commons.collections.CollectionUtils;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Created 2021/6/15.
@@ -44,56 +60,43 @@ public class HandoverServiceImpl implements HandoverService {
 
     @Autowired
     private HandoverStaffMapper handoverStaffMapper;
-
     @Autowired
     private HandoverExternalMapper handoverExternalMapper;
-
-
     @Autowired
     private HandoverTransferMapper handoverTransferMapper;
-
     @Autowired
     private StaffMapper staffMapper;
-
     @Autowired
     private TabHaobanExternalClerkRelatedMapper externalClerkRelatedMapper;
-
     @Autowired
     private QywxUserApiService qywxUserApiService;
-
-    @Autowired
-    private Config config;
-
-    @Autowired
-    private WxEnterpriseMapper wxEnterpriseMapper;
-
     @Autowired
     private SecretSettingService secretSettingService;
-
     @Autowired
     private TabHaobanClerkMainStoreRelatedMapper clerkMainStoreRelatedMapper;
-
     @Autowired
     private StaffClerkRelationService staffClerkRelationService;
+    @Autowired
+    private WxEnterpriseService wxEnterpriseService ;
 
     @Override
     public boolean saveHandover(String wxEnterpriseId, List<QywxUnassignedInfoDTO> infoList) {
         logger.info("saveHandover-保存离职基础数据：{}", wxEnterpriseId);
-        TabHaobanWxEnterprise wxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(wxEnterpriseId);
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         if (CollectionUtils.isEmpty(infoList)) {
             logger.info("没有要保存的数据，删除所有需要删除逇");
             delHandoverStaff(wxEnterpriseId, null);
             return false;
         }
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterprise.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
-            logger.info("没有配置secret：{}", JSONObject.toJSONString(wxEnterprise));
+            logger.info("没有配置secret：{}", JSONObject.toJSONString(qwDTO));
             return false;
         }
 
         Map<String, List<QywxUnassignedInfoDTO>> handoverUserMap = infoList.stream().collect(Collectors.groupingBy(dto -> dto.getHandoverUserid()));
         handoverUserMap.forEach((userId, list) -> {
-            boolean checkFlag = checkStaffOver(secretSetting, userId, wxEnterprise.getCorpid());
+            boolean checkFlag = checkStaffOver(secretSetting, userId, qwDTO.getThirdCorpid());
             if (checkFlag) {
                 logger.info("该用户存在，不需要离职基础：{},{}", userId, wxEnterpriseId);
                 return;
@@ -103,7 +106,7 @@ public class HandoverServiceImpl implements HandoverService {
                 return;
             }
             List<TabHandoverExternal> externalList = list.stream().map(dto -> {
-                TabHandoverExternal mid = getHandExternal(dto, wxEnterprise, handoverStaff);
+                TabHandoverExternal mid = getHandExternal(dto, qwDTO.getWxEnterpriseId(), handoverStaff);
                 mid.setStaffId(handoverStaff.getStaffId());
                 handoverStaff.setDimissionTime(dto.getDimissionTimeDate());
                 mid.setStatusFlag(mid.getStatusFlag() != null ? mid.getStatusFlag() : 1);
@@ -212,16 +215,16 @@ public class HandoverServiceImpl implements HandoverService {
      * @param infoDTO
      * @return
      */
-    private TabHandoverExternal getHandExternal(QywxUnassignedInfoDTO infoDTO, TabHaobanWxEnterprise wxEnterprise, TabHandoverStaff handoverStaff) {
-        TabHandoverExternal handoverExternal = handoverExternalMapper.getByExternalUserIdAndStaffId(wxEnterprise.getWxEnterpriseId(), handoverStaff.getStaffId(), infoDTO.getExternalUserid());
+    private TabHandoverExternal getHandExternal(QywxUnassignedInfoDTO infoDTO, String wxEnterpriseId, TabHandoverStaff handoverStaff) {
+        TabHandoverExternal handoverExternal = handoverExternalMapper.getByExternalUserIdAndStaffId(wxEnterpriseId, handoverStaff.getStaffId(), infoDTO.getExternalUserid());
         if (null != handoverExternal) {
             return handoverExternal;
         }
         TabHandoverExternal mid = new TabHandoverExternal();
         mid.setExternalUserId(infoDTO.getExternalUserid());
-        mid.setWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
+        mid.setWxEnterpriseId(wxEnterpriseId);
         mid.setHaobanFriendFlag(0);
-        TabHaobanExternalClerkRelated externalClerkRelated = externalClerkRelatedMapper.getLastByExTernalUseridAndWxUserIdNoStatus(wxEnterprise.getWxEnterpriseId(), infoDTO.getExternalUserid(), infoDTO.getHandoverUserid());
+        TabHaobanExternalClerkRelated externalClerkRelated = externalClerkRelatedMapper.getLastByExTernalUseridAndWxUserIdNoStatus(wxEnterpriseId, infoDTO.getExternalUserid(), infoDTO.getHandoverUserid());
         if (null == externalClerkRelated) {
             mid.setExternalUserName("企业微信客户");
             mid.setRelationId("-1");

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

@@ -69,14 +69,14 @@ public class SecretSettingServiceImpl implements SecretSettingService {
         }
         //兼容好办助手和代开发
         TabSecretSetting secretSetting = null;
-        if (secretType == SecretTypeEnum.HAOBAN_HELP.getVal()) {
+        if (secretType == SecretTypeEnum.CUSTOMIZED_APP.getVal()) {
             secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
             if (secretSetting == null) {
                 secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal(), null);
             }
         } else {
-            secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
         }
+        secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
         return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
     }
 

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

 package com.gic.haoban.manage.service.service.impl;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
@@ -8,7 +22,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.StringUtil;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.enums.BindTypeEnum;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
@@ -19,18 +33,14 @@ import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMappe
 import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
-import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class StaffClerkRelationServiceImpl implements StaffClerkRelationService {
@@ -325,9 +335,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         if (CollectionUtils.isEmpty(clerkList)) {
             return null;
         }
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        String corpid = wxEnterpriseDTO.getCorpid();
-        if (corpid.length() > 20) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO.needOpenUserId3th()) {
             return mapper.listWxOpenUserIdByClerkIds(clerkList, wxEnterpriseId);
         }
         return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId);

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

@@ -72,12 +72,6 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	}
 
 	@Override
-	public int countByDepartmentId(String departmentId) {
-		
-		return mapper.countByDepartmentId(departmentId);
-	}
-
-	@Override
 	public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentIds, String keyword) {
 		if(departmentIds == null || departmentIds.isEmpty()){
 			return Collections.EMPTY_LIST;

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

@@ -58,7 +58,6 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     public WxEnterpriseQwDTO getQwInfo(String wxEnterpriseId) {
         TabHaobanWxEnterprise wxEnterprise = this.mapper.selectByPrimaryKey(wxEnterpriseId) ;
         WxEnterpriseQwDTO qw = new WxEnterpriseQwDTO();
-        qw.setCorpid(wxEnterprise.getCorpid());
         qw.setWxEnterpriseId(wxEnterpriseId);
         if(null != wxEnterprise.getWxSecurityType()) {
             qw.setWxSecurityType(wxEnterprise.getWxSecurityType());
@@ -115,11 +114,6 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     }
 
     @Override
-    public TabHaobanWxEnterprise getEnterpriseBycorpIdNoStatus(String corpId) {
-        return this.mapper.getEnterpriseBycorpId(corpId, null);
-    }
-
-    @Override
     public TabHaobanWxEnterprise getEnterpriseByCorpName(String corpName) {
         if (StringUtils.isBlank(corpName)) {
             return null;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

 package com.gic.haoban.manage.service.service.notify.out;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Constant;
@@ -7,7 +24,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.notify.dto.NoticeMessageInfoDTO;
 import com.gic.haoban.manage.api.dto.notify.qdto.NoticeMessageQDTO;
 import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
@@ -25,22 +42,6 @@ import com.gic.haoban.manage.service.service.notify.NoticeMessageTemplateService
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Created 2021/12/17.
@@ -231,18 +232,15 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
      * @param messageTypeEnum
      */
     private void sendMessage(List<TemplateContentBO> contentList, String wxEnterpriseId, String wxUserId, NoticeMessageTypeEnum messageTypeEnum, String data) {
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-
-        String corpid = wxEnterpriseDTO.getCorpid();
-
+        String corpid = qwDTO.getThirdCorpid() ;
         TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
         if (tabHaobanStaff == null) {
             logger.error("未查询到员工：wxUserId:{}", wxUserId);
             return;
         }
-
-        if (corpid.length() > 20) {
+        if (qwDTO.needOpenUserId3th()) {
             wxUserId = tabHaobanStaff.getWxOpenUseId();
         } else {
             wxUserId = tabHaobanStaff.getWxUserId();
@@ -273,6 +271,6 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
         messageDTO.setPage(appUrl);
         messageDTO.setTitle(messageTypeEnum.getName());
         messageDTO.setItems(items);
-        qywxSuiteApiService.sendMessage(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), messageDTO);
+        qywxSuiteApiService.sendMessage(corpid, config.getWxSuiteid(), messageDTO);
     }
 }

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

@@ -528,15 +528,15 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
     @Override
     public String dealQywxDepartment(String taskId, String wxEnterpriseId) {
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
             logger.info("没有配置secret");
             syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.exception_close.getVal());
             unlockTask(wxEnterpriseId);
             return "没有配置secret";
         }
-        List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = qywxDepartmentApiService.listSelfDepartment(wxEnterpriseDTO.getCorpid(), secretSetting.getSecretVal(), 1);
+        List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = qywxDepartmentApiService.listSelfDepartment(qwDTO.getThirdCorpid(), secretSetting.getSecretVal(), 1);
         if (CollectionUtils.isEmpty(list)) {
             logger.info("没有数据同步");
             syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.exception_close.getVal());

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

@@ -108,48 +108,6 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
     }
 
     @Override
-    public ServiceResponse recycle(String departmentId) {
-        ServiceResponse hr = new ServiceResponse();
-        hr.setCode(1);
-
-        List<TabHaobanDepartment> list = departmentService.listByParentId(departmentId);
-        logger.info("【部门删除】list.size={}", list.size());
-        if (!list.isEmpty()) {
-            hr.setCode(0);
-            hr.setMessage("存在子部门，删除部门失败");
-            return hr;
-        }
-
-        List<TabHaobanStaffDepartmentRelated> staffList = staffDepartmentService.listByDepartmentId(departmentId);
-        logger.info("【部门删除】staffList.size={}", staffList.size());
-        if (!staffList.isEmpty()) {
-            hr.setCode(0);
-            hr.setMessage("存在成员，删除部门失败");
-            return hr;
-        }
-        //调微信的新增接口
-        TabHaobanDepartment department = departmentService.selectById(departmentId);
-        WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(department.getWxEnterpriseId());
-        if (enterpriseDTO != null) {
-            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.CONTACT_SECRET.getVal());
-            if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
-                hr.setCode(0);
-                hr.setMessage("没有设置通讯录secret");
-                return hr;
-            }
-            JSONResponse jp = qywxDepartmentApiService.deleteSelfDepartment(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), Integer.parseInt(department.getWxDepartmentId()));
-            if (jp.getErrorCode() != 0) {
-                hr.setCode(0);
-                hr.setMessage("微信删除部门失败");
-                return hr;
-            }
-        }
-
-        departmentService.recycle(departmentId);
-        return hr;
-    }
-
-    @Override
     public ServiceResponse wxCallBackrecycle(String departmentId) {
         ServiceResponse hr = new ServiceResponse();
         hr.setCode(1);
@@ -179,47 +137,6 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
     }
 
     @Override
-    public ServiceResponse repairRecycle(String departmentId, String parentId) {
-        ServiceResponse hr = new ServiceResponse();
-        hr.setCode(0);
-        TabHaobanDepartment tab = departmentService.selectById(departmentId);
-        //调微信的新增接口
-        String wxDepartmentId = "";
-        WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(tab.getWxEnterpriseId());
-        logger.info("【部门新增】enterpriseDTO = {}", JSON.toJSONString(enterpriseDTO));
-        if (enterpriseDTO != null) {
-            com.gic.wechat.api.dto.qywx.DepartmentDTO dto = new com.gic.wechat.api.dto.qywx.DepartmentDTO();
-            dto.setCorpid(enterpriseDTO.getCorpid());
-            dto.setName(tab.getDepartmentName());
-            dto.setOrder(tab.getSort());
-            TabHaobanDepartment parent = departmentService.selectById(parentId);
-            dto.setParentid(Integer.valueOf(parent.getWxDepartmentId()));
-            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.CONTACT_SECRET.getVal());
-            if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
-                hr.setCode(0);
-                hr.setMessage("没有设置通讯录secret");
-                return hr;
-            }
-            logger.info("【部门新增】corpid() = {},siteId={},dto={}", enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), JSON.toJSONString(dto));
-            JSONResponse jp = qywxDepartmentApiService.createSelfDepartment(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), dto);
-            logger.info("【部门新增】jp = {}", JSON.toJSONString(jp));
-            if (jp.getErrorCode() != 0) {
-                hr.setCode(0);
-                hr.setMessage("微信新增部门失败");
-                return hr;
-            }
-            wxDepartmentId = jp.getResult().toString();
-            tab.setWxDepartmentId(wxDepartmentId);
-            tab.setParentDepartmentId(parentId);
-            logger.info("【部门新增】wxDepartmentId = {}", wxDepartmentId);
-        }
-        departmentService.repairRecycle(tab);
-
-        return hr;
-
-    }
-
-    @Override
     public List<DepartmentDTO> listByDepartmentIds(List<String> departmentIds,
                                                    Integer storeFlag) {
         List<TabHaobanDepartment> list = departmentMapper.listByDepartmentIds(departmentIds, storeFlag);

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+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.redisson.api.RRateLimiter;
+import org.redisson.api.RateIntervalUnit;
+import org.redisson.api.RateType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -13,16 +32,30 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.AlertMessageDTO;
+import com.gic.haoban.manage.api.dto.ClerkStaffWxUserDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
+import com.gic.haoban.manage.api.dto.FriendMemberStatusDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.AlertTypeEnum;
 import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.dao.mapper.*;
-import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.dao.mapper.ExternalUseridLogMapper;
+import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
+import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
+import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
+import com.gic.haoban.manage.service.entity.TabExternalUseridLog;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
 import com.gic.member.api.service.MemberApiService;
 import com.gic.mq.sdk.GicMQClient;
@@ -31,20 +64,6 @@ import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-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.redisson.api.RRateLimiter;
-import org.redisson.api.RateIntervalUnit;
-import org.redisson.api.RateType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 @Service
 public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedApiService {
@@ -73,6 +92,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private MemberApiService memberApiService;
     @Autowired
     private WxUserAddLogService wxUserAddLogService;
+    @Autowired
+    private WxEnterpriseService wxEnterpriseService ;
 
     /**
      * 查询导购好友关联
@@ -355,14 +376,12 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             // 2个列表都为空查不了关系
             return Collections.emptyMap();
         }
-        TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterriseMapper.selectByPrimaryKey(wxEnterpriseId);
-        if (tabHaobanWxEnterprise == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
             return Collections.emptyMap();
         }
-        //新老企业兼容
-        String corpid = tabHaobanWxEnterprise.getCorpid();
         List<MemberStaffRelExtDO> res = new ArrayList<>();
-        if (corpid.length() > 20) {
+        if (qwDTO.needOpenUserId3th()) {
             res = staffClerkRelationMapper.listMemberStaffRelNew(memberIdList, clerkIdList, enterpriseId);
         } else {
             res = staffClerkRelationMapper.listMemberStaffRel(memberIdList, clerkIdList, enterpriseId);
@@ -413,7 +432,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         }
         RedisUtil.lock(lockKey, 1L, TimeUnit.DAYS, 0L);
         try {
-            updateNewExUserId(tabHaobanWxEnterprise.getWxEnterpriseId(), tabHaobanWxEnterprise.getCorpid());
+            WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+            updateNewExUserId(tabHaobanWxEnterprise.getWxEnterpriseId(), qwDTO.getThirdCorpid());
             log.info("企业外部联系人id end,wxEnterpriseId:{}", wxEnterpriseId);
             RedisUtil.unlock(lockKey);
             serviceResponse.setCode(HaoBanErrCodeCommon.ERR_1.getCode());

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

@@ -99,9 +99,8 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
 
     @Override
     public void dealQywxEnterpriseHandover(String wxEnterpriseId) {
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        logger.info("拉取单个企业微信的离职成员：{},{}", wxEnterpriseId, JSONObject.toJSONString(wxEnterpriseDTO));
-        List<QywxUnassignedInfoDTO> allQywxUnassigned = getAllQywxUnassigned(wxEnterpriseDTO);
+        logger.info("拉取单个企业微信的离职成员：{}", wxEnterpriseId);
+        List<QywxUnassignedInfoDTO> allQywxUnassigned = getAllQywxUnassigned(wxEnterpriseId);
         logger.info("处理离职成员数量：{},{}", wxEnterpriseId, allQywxUnassigned.size());
         handoverService.saveHandover(wxEnterpriseId, allQywxUnassigned);
     }
@@ -111,13 +110,14 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
      * @param wxEnterpriseDTO
      * @return
      */
-    private List<QywxUnassignedInfoDTO> getAllQywxUnassigned(WxEnterpriseDTO wxEnterpriseDTO) {
+    private List<QywxUnassignedInfoDTO> getAllQywxUnassigned(String wxEnterpriseId) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         List<QywxUnassignedInfoDTO> ret = new ArrayList<>();
         QywxGetUnassignedListDTO unassignedListDTO = null;
         String cursor = null;
         do {
             //离职成员客户列表
-            unassignedListDTO = qywxUserApiService.getUnassignedList(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), cursor);
+            unassignedListDTO = qywxUserApiService.getUnassignedList(qwDTO.getThirdCorpid(), config.getWxSuiteid(), cursor);
             cursor = unassignedListDTO.getNextCursor();
             if (CollectionUtils.isNotEmpty(unassignedListDTO.getInfo())) {
                 ret.addAll(unassignedListDTO.getInfo());
@@ -138,7 +138,7 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
 
     @Override
     public void dealQywxEnterpriseHandoverResult(String wxEnterpriseId) {
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         Date date = DateUtils.addDays(new Date(), -3);
         String day = DateFormatUtils.format(date, "yyyy-MM-dd");
         List<TabHandoverTransfer> transfers = handoverService.listTransferByWxEnterpriseId(wxEnterpriseId, day);
@@ -150,7 +150,7 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
             try {
                 TabHaobanStaff handover = staffService.selectById(dto.getHandoverStaffId());
                 TabHaobanStaff takeover = staffService.selectById(dto.getTakeoverStaffId());
-                QywxTransferCustomerDTO customerDTO = qywxUserApiService.transferResult(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), handover.getWxUserId(), takeover.getWxUserId(), true);
+                QywxTransferCustomerDTO customerDTO = qywxUserApiService.transferResult(qwDTO.getThirdCorpid(), config.getWxSuiteid(), handover.getWxUserId(), takeover.getWxUserId(), true);
                 if (customerDTO.getErrcode() != 0) {
                     return;
                 }
@@ -243,7 +243,7 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
 
     @Override
     public void transferFriend(String wxEnterpriseId, List<String> handoverExternalIds, String disStaffId, String storeId) {
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         TabHaobanStaff tabHaobanStaff = staffService.selectById(disStaffId);
         List<TabHandoverExternal> externalList = handoverService.listByIds(wxEnterpriseId, handoverExternalIds);
         //分配人与客户的关联map
@@ -254,7 +254,7 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
         Map<String, List<String>> userByIdMap = externalList.stream().collect(Collectors.groupingBy(dto -> dto.getUserId(), Collectors.mapping(dto -> dto.getHandoverExternalId(), Collectors.toList())));
 
         handoverStaffExternalMap.forEach((wxUserId, list) -> {
-            QywxTransferCustomerDTO transferCustomerResp = qywxUserApiService.transferCustomer(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), wxUserId, tabHaobanStaff.getWxUserId(), list);
+            QywxTransferCustomerDTO transferCustomerResp = qywxUserApiService.transferCustomer(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxUserId, tabHaobanStaff.getWxUserId(), list);
             if (transferCustomerResp.getErrcode() != 0) {
                 logger.info("转移异常");
             }

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.JSONResponse;
 import com.gic.api.base.commons.Page;
@@ -11,6 +28,7 @@ import com.gic.haoban.manage.api.dto.BatchAddMaterialDTO;
 import com.gic.haoban.manage.api.dto.MaterialCategoryDTO;
 import com.gic.haoban.manage.api.dto.MaterialDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.service.MaterialApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.entity.TabHaobanMaterial;
@@ -23,17 +41,6 @@ import com.gic.haoban.manage.service.util.CommonUtil;
 import com.gic.wechat.api.enums.QywxMediaTypeEnum;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.github.pagehelper.PageHelper;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @Service
 public class MaterialApiServiceImpl implements MaterialApiService {
@@ -103,12 +110,14 @@ public class MaterialApiServiceImpl implements MaterialApiService {
     @Override
     public void insertMaterial(MaterialDTO materialDTO) {
         Integer type = materialDTO.getMaterialType();
-        String wxEnterpriseId = materialDTO.getWxEnterpriseId();
-        WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
         if (type == null) {
+            logger.info("type is null");
             return;
         }
-        if (enterprise == null) {
+        String wxEnterpriseId = materialDTO.getWxEnterpriseId();
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
+            logger.info("qwDTO is null");
             return;
         }
         QywxMediaTypeEnum fileType = null;
@@ -132,7 +141,7 @@ public class MaterialApiServiceImpl implements MaterialApiService {
         if (type == 3) {
             String imgUrl = materialDTO.getImgUrl();
             logger.info("【上传图片】imgUrl={}", imgUrl);
-            JSONResponse response = qywxSuiteApiService.uploadImage(enterprise.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(imgUrl));
+            JSONResponse response = qywxSuiteApiService.uploadImage(qwDTO.getThirdCorpid() , config.getWxSuiteid(), CommonUtil.getFileByte(imgUrl));
             logger.info("【上传图片返回】response={}", JSON.toJSONString(response));
             String wxImgUrl = response.getResult() == null ? "" : response.getResult().toString();
             materialDTO.setWxImgUrl(wxImgUrl);
@@ -140,7 +149,7 @@ public class MaterialApiServiceImpl implements MaterialApiService {
         if (fileType != null) {
             String[] arr = url.split("/");
             int count = arr.length;
-            JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
+            JSONResponse jp = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid() , config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
             if (jp.getErrorCode() == 0) {
                 materialDTO.setWxLastUploadTime(new Date());
                 materialDTO.setMediaId(jp.getResult().toString());
@@ -167,11 +176,12 @@ public class MaterialApiServiceImpl implements MaterialApiService {
         String materialId = materialDTO.getMaterialId();
         MaterialDTO old = materialService.selectMaterialById(materialId);
         String wxEnterpriseId = old.getWxEnterpriseId();
-        WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
         if (type == null) {
             return;
         }
-        if (enterprise == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
+            logger.info("qwDTO is null");
             return;
         }
         QywxMediaTypeEnum fileType = null;
@@ -196,7 +206,7 @@ public class MaterialApiServiceImpl implements MaterialApiService {
             String imgUrl = materialDTO.getImgUrl();
             String oldImgUrl = materialDTO.getImgUrl();
             if (!imgUrl.equals(oldImgUrl)) {
-                JSONResponse response = qywxSuiteApiService.uploadImage(enterprise.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(imgUrl));
+                JSONResponse response = qywxSuiteApiService.uploadImage(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(imgUrl));
                 String wxImgUrl = response.getResult() == null ? "" : response.getResult().toString();
                 materialDTO.setWxImgUrl(wxImgUrl);
             }
@@ -204,7 +214,7 @@ public class MaterialApiServiceImpl implements MaterialApiService {
         if (fileType != null && !url.equals(oldUrl)) {
             String[] arr = url.split("/");
             int count = arr.length;
-            JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
+            JSONResponse jp = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
             if (jp.getErrorCode() == 0) {
                 materialDTO.setWxLastUploadTime(new Date());
                 materialDTO.setMediaId(jp.getResult().toString());
@@ -224,8 +234,9 @@ public class MaterialApiServiceImpl implements MaterialApiService {
             return "";
         }
         String wxEnterpriseId = old.getWxEnterpriseId();
-        WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
-        if (enterprise == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
+            logger.info("qwDTO is null");
             return "";
         }
         String url = "";
@@ -252,7 +263,7 @@ public class MaterialApiServiceImpl implements MaterialApiService {
         }
         String[] arr = url.split("/");
         int count = arr.length;
-        JSONResponse jp = qywxSuiteApiService.uploadMedia(enterprise.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
+        JSONResponse jp = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
         if (jp.getErrorCode() == 0) {
             old.setWxLastUploadTime(new Date());
             old.setMediaId(jp.getResult().toString());
@@ -381,8 +392,8 @@ public class MaterialApiServiceImpl implements MaterialApiService {
     public void batchInsertMaterial(BatchAddMaterialDTO dto) {
         // 构造素材实体类
         BatchAddMaterialDTO.Material material = dto.getMaterial();
-        WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(material.getWxEnterpriseId());
-        if (enterprise == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(material.getWxEnterpriseId()) ;
+        if (qwDTO == null) {
             return;
         }
         List<BatchAddMaterialDTO.MaterialMedia> materialMediaList = dto.getMaterialMediaList();
@@ -409,7 +420,7 @@ public class MaterialApiServiceImpl implements MaterialApiService {
                 materialDTO.setMaterialTitle(material.getMaterialTitle());
             }
             materialDTO.setImgUrl(one.getMediaUrl());
-            String mediaId = uploadMediaToWx(enterprise.getCorpid(), one.getMediaUrl());
+            String mediaId = uploadMediaToWx(qwDTO.getThirdCorpid(), one.getMediaUrl());
             if (StringUtils.isNotEmpty(mediaId)) {
                 materialDTO.setWxLastUploadTime(new Date());
                 materialDTO.setMediaId(mediaId);

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

@@ -307,7 +307,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             staffApiService.staffEdit(staffDTO, departmentIds.toString());
         } else if (changeType.equals(WxEditType.DELETE_USER.getCode())) {
             log.info("成员同步删除，userid:{}", userid);
-            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal());
+            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
             if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
                 log.info("没有配置secret,wxEnterpriseId:{}", wxEnterpriseId);
                 return;
@@ -368,7 +368,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             return;
         }
         String wxEnterpriseId = wxApplication.getWxEnterpriseId();
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal());
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
             log.info("没有配置secret：{}", wxEnterpriseId);
             return;
@@ -462,7 +462,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("未查询到企业关联企业 wxEnt");
             return;
         }
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal());
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
             log.info("没有配置secret：{}", wxEnterpriseId);
             return;
@@ -499,15 +499,15 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("clerkId未绑定:clerkId={}", clerkId);
             return false;
         }
-        WxEnterpriseDTO wxEnterprise = wxEnterpriseService.selectById(relation.getWxEnterpriseId());
-        if (wxEnterprise == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(relation.getWxEnterpriseId()) ;
+        if (qwDTO == null) {
             log.info("企业为空");
             return false;
         }
         StaffDTO staffDTO = staffApiService.selectById(relation.getStaffId());
-        String corpid = wxEnterprise.getCorpid();
+        String corpid = qwDTO.getThirdCorpid() ;
         String wxUserId = "";
-        if (corpid.length() > 20) {
+        if (qwDTO.needOpenUserId3th()) {
             wxUserId = staffDTO.getWxOpenUseId();
         } else {
             wxUserId = staffDTO.getWxUserId();
@@ -584,8 +584,8 @@ public class MessageApiServiceImpl implements MessageApiService {
         String title = jsonObject.getString("title");
         String content = jsonObject.getString("content");
         String memberName = jsonObject.getString("memberName");
-        WxEnterpriseDTO wxEnterprise = wxEnterpriseService.selectById(wxEnterpriseId);
-        if (wxEnterprise == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
             log.info("企业为空");
             return;
         }
@@ -602,21 +602,20 @@ public class MessageApiServiceImpl implements MessageApiService {
         messageDTO.setPage(pageUrl);
         messageDTO.setTitle(title);
         messageDTO.setItems(items);
-        qywxSuiteApiService.sendMessage(wxEnterprise.getCorpid(), config.getWxSuiteid(), messageDTO);
+        qywxSuiteApiService.sendMessage(qwDTO.getThirdCorpid(), config.getWxSuiteid(), messageDTO);
     }
 
     @Override
     public String getNewWxUserId(String wxEnterpriseId, String wxUserId) {
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        if (wxEnterpriseDTO == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
             return "";
         }
-        String corpid = wxEnterpriseDTO.getCorpid();
         TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
         if (tabHaobanStaff == null) {
             return "";
         }
-        return corpid.length() > 20 ? tabHaobanStaff.getWxOpenUseId() : tabHaobanStaff.getWxUserId();
+        return qwDTO.needOpenUserId3th() ? tabHaobanStaff.getWxOpenUseId() : tabHaobanStaff.getWxUserId();
     }
 
 
@@ -695,7 +694,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             staffApiService.staffEdit(staffDTO, departmentIds.toString());
         } else if (changeType.equals(WxEditType.DELETE_USER.getCode())) {
             log.info("成员同步删除，userid:{}", userid);
-            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal());
+            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
             if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
                 log.info("没有配置secret,wxEnterpriseId:{}", wxEnterpriseId);
                 return;
@@ -756,7 +755,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             return;
         }
         String wxEnterpriseId = wxApplication.getWxEnterpriseId();
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal());
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
             log.info("没有配置secret：{}", wxEnterpriseId);
             return;

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.gic.api.base.commons.JSONResponse;
 import com.gic.commons.util.ToolUtil;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.TabMiniprogramSettingMapper;
 import com.gic.haoban.manage.service.entity.TabMiniprogramSetting;
@@ -11,14 +21,6 @@ import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.util.CommonUtil;
 import com.gic.wechat.api.enums.QywxMediaTypeEnum;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Created 2021/4/16.
@@ -55,8 +57,8 @@ public class MiniprogramSettingServiceImpl implements MiniprogramSettingService
             return miniprogramSetting;
         }
         String[] arr = miniprogramSetting.getImageUrl().split("/");
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(miniprogramSetting.getWxEnterpriseId());
-        JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(miniprogramSetting.getImageUrl()), arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode());
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(miniprogramSetting.getWxEnterpriseId()) ;
+        JSONResponse jp = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(miniprogramSetting.getImageUrl()), arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode());
         if (jp.getErrorCode() == 0) {
             miniprogramSetting.setMediaTime(date);
             miniprogramSetting.setMediaId(jp.getResult().toString());
@@ -105,8 +107,8 @@ public class MiniprogramSettingServiceImpl implements MiniprogramSettingService
             return miniprogramSetting;
         }
         String[] arr = miniprogramSetting.getImageUrl().split("/");
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(miniprogramSetting.getImageUrl()), arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode());
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        JSONResponse jp = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(miniprogramSetting.getImageUrl()), arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode());
         if (jp.getErrorCode() == 0) {
             miniprogramSetting.setMediaTime(date);
             miniprogramSetting.setMediaId(jp.getResult().toString());

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

@@ -400,15 +400,15 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
         send.setUser(userIds);
 
 
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(relationDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(relationDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
             logger.info("没有配置secret:{}", relationDTO.getWxEnterpriseId());
             response.setCode(3);
             response.setMessage("企业微信配置异常");
             return response;
         }
-        WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(relationDTO.getWxEnterpriseId());
-        String configId = qywxUserApiService.getSelfExternalcontactByUserId(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), send);
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(relationDTO.getWxEnterpriseId()) ;
+        String configId = qywxUserApiService.getSelfExternalcontactByUserId(qwDTO.getDkCorpid() , secretSetting.getSecretVal(), send);
         logger.info("configId:{}", configId);
         if (StringUtils.isBlank(configId)) {
             logger.info("staff:{}", configId, JSONObject.toJSONString(relationDTO));

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.AppPageType;
 import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
-import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
@@ -21,20 +37,12 @@ import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
+import cn.hutool.core.collection.CollectionUtil;
 
 @Service
 public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRelatedApiService {
@@ -57,7 +65,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
     @Autowired
     private StaffApiService staffApiService;
     @Autowired
-    private HmQrcodeApiService hmQrcodeApiService;
+    private WxEnterpriseService wxEnterpriseService;
 
     @Override
     public List<StaffDepartmentRelatedDTO> listByDepartmentId(String departmentId) {
@@ -146,21 +154,20 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         if (clerkDTO == null) {
             return map;
         }
-        TabHaobanWxEnterprise wxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(relation.getWxEnterpriseId());
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(relation.getWxEnterpriseId()) ;
         StaffDTO staffDTO = staffApiService.selectById(relation.getStaffId());
         if (staffDTO == null) {
             return map;
         }
-        String corpid = wxEnterprise.getCorpid();
         String wxUserId = "";
-        if (corpid.length() > 20) {
+        if (qwDTO.needOpenUserId3th()) {
             wxUserId = staffDTO.getWxOpenUseId();
         } else {
             wxUserId = staffDTO.getWxUserId();
         }
         map.put("wxUserId", wxUserId);
-        map.put("wxEnterpriseId", wxEnterprise.getWxEnterpriseId());
-        map.put("corpId", wxEnterprise.getCorpid());
+        map.put("wxEnterpriseId", qwDTO.getWxEnterpriseId());
+        map.put("corpId", qwDTO.getThirdCorpid());
         map.put("clerkName", clerkDTO.getClerkName());
         return map;
     }
@@ -171,17 +178,16 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         if (staffDTO == null) {
             return map;
         }
-        TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(staffDTO.getWxEnterpriseId());
-        String corpid = tabHaobanWxEnterprise.getCorpid();
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(staffDTO.getWxEnterpriseId()) ;
         String wxUserId = "";
-        if (corpid.length() > 20) {
+        if (qwDTO.needOpenUserId3th()) {
             wxUserId = staffDTO.getWxOpenUseId();
         } else {
             wxUserId = staffDTO.getWxUserId();
         }
         map.put("wxUserId", wxUserId);
-        map.put("wxEnterpriseId", tabHaobanWxEnterprise.getWxEnterpriseId());
-        map.put("corpId", tabHaobanWxEnterprise.getCorpid());
+        map.put("wxEnterpriseId", qwDTO.getWxEnterpriseId());
+        map.put("corpId", qwDTO.getThirdCorpid());
         map.put("staffName", staffDTO.getStaffName());
         return map;
     }
@@ -201,22 +207,21 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         jsonObject.put("storeId", storeId);
         String data = jsonObject.toJSONString();
         String pageUrl = this.getPageUrl(AppPageType.MY_RELATED_RECORD.getCode(), data);
-        TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(staffDTO.getWxEnterpriseId());
-        String corpId = tabHaobanWxEnterprise.getCorpid();
         String name = staffDTO.getStaffName();
         if (content.length() > 30) {
             content = content.substring(0, 26);
             content = content + "...";
         }
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(staffDTO.getWxEnterpriseId()) ;
         String wxUserId = "";
-        if (corpId.length() > 20) {
+        if (qwDTO.needOpenUserId3th()) {
             wxUserId = staffDTO.getWxOpenUseId();
         } else {
             wxUserId = staffDTO.getWxUserId();
         }
         //先发送下，试试
         QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-        List<ItemDTO> items = new ArrayList();
+        List<ItemDTO> items = new ArrayList<>();
         ItemDTO dto1 = new ItemDTO();
         ItemDTO dto2 = new ItemDTO();
         ItemDTO dto3 = new ItemDTO();
@@ -243,10 +248,8 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         messageDTO.setPage(pageUrl);
         messageDTO.setTitle(messageTitle);
         messageDTO.setItems(items);
-
-        logger.info("发送参数为corpId============:{},suitId============:{},messageDTO============:{},", corpId, config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
-
-        boolean b = qywxSuiteApiService.sendMessage(corpId, config.getWxSuiteid(), messageDTO);
+        logger.info("发送参数为corpId============:{},suitId============:{},messageDTO============:{},", qwDTO.getThirdCorpid(), config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
+        boolean b = qywxSuiteApiService.sendMessage(qwDTO.getThirdCorpid(), config.getWxSuiteid(), messageDTO);
         logger.info("发送===============》{}", b);
     }
 

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+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.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
@@ -7,27 +23,34 @@ import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.MiniprogramSettingDTO;
+import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
+import com.gic.haoban.manage.api.dto.SecretSettingDTO;
+import com.gic.haoban.manage.api.dto.StaffPrivacyUseLogDTO;
+import com.gic.haoban.manage.api.dto.WelcomeDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
-import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
+import com.gic.haoban.manage.service.entity.TabMiniprogramSetting;
+import com.gic.haoban.manage.service.entity.TabWelcome;
 import com.gic.haoban.manage.service.pojo.bo.StaffPrivacyUseLogBO;
-import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.service.MiniprogramSettingService;
+import com.gic.haoban.manage.service.service.SecretSettingService;
+import com.gic.haoban.manage.service.service.StaffPrivacyUseLogService;
+import com.gic.haoban.manage.service.service.WxApplicationService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-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.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
 
 @Service
 public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
@@ -52,6 +75,8 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     private Config config;
     @Autowired
     private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
+    @Autowired
+    private QywxUserApiService qywxUserApiService ;
 
     @Override
     public void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto) {
@@ -67,31 +92,39 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         String qywxMemberSuite = config.getQywxMemberSuite();
         WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, dto);
         String wxEnterpriseId = "";
-        TabHaobanWxEnterprise wxEnterprise = null;
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpid);
+        // 调用企微接口
+        String serviceCorpid = config.getCorpid();
+        String openCorpid = qywxUserApiService.toOpenCorpid(serviceCorpid, corpid);
+        log.info("查询企微id,入参={},返回={}",corpid , openCorpid);
+        if(StringUtils.isNotBlank(openCorpid) && !openCorpid.equals(corpid)) {
+            wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(openCorpid);
+            log.info("通过密文corpid查询={},{}",openCorpid , wxEnterprise!=null?wxEnterprise.getWxEnterpriseId():null);
+        }
         // 获取授权好办小程序
-        wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpid);
         if (wxEnterprise == null) {
             log.info("通过corpid={}未查到记录",corpid);
             wxEnterprise = this.wxEnterpriseService.getEnterpriseByCorpName(corpName);
         }
-
         if (wxEnterprise != null) {
+            log.info("查询wxEnterpriseId={}", wxEnterprise.getWxEnterpriseId());
             wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
             WxEnterpriseDTO wxEnterpriseDTO = new WxEnterpriseDTO();
             wxEnterpriseDTO.setWxEnterpriseId(wxEnterpriseId);
             wxEnterpriseDTO.setStatusFlag(1);
             wxEnterpriseDTO.setBindFlag(1);
-            // 如果corpid为空且是好办小程序,写入corpid
+            if(StringUtils.isNotBlank(openCorpid)) {
+                this.setCorpid(corpid, openCorpid, wxEnterpriseDTO);
+            }
             wxEnterpriseService.update(wxEnterpriseDTO);
         } else {
-            // 如果不是好办,不需要写入corpid
+            if(StringUtils.isNotBlank(openCorpid)) {
+                this.setCorpid(corpid, openCorpid, wxDTO);
+            }
+            wxDTO.setWxSecurityType(2);
             wxEnterpriseId = wxEnterpriseService.add(wxDTO);
         }
-        /*if (StringUtils.isNotBlank(userId)) {
-            staffApiService.wxGetAdd(userId, wxEnterpriseId);
-        }*/
-        TabHaobanWxApplication haobanWxApplication = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId,
-                wxEnterpriseId);
+        TabHaobanWxApplication haobanWxApplication = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId, wxEnterpriseId);
         if (haobanWxApplication == null) {
             log.info("新增应用,suiteid={}",siteId);
             haobanWxApplication = new TabHaobanWxApplication();
@@ -151,6 +184,16 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         log.info("企业微信授权处理完成");
     }
 
+    private void setCorpid(String corpid, String openCorpid, WxEnterpriseDTO wxEnterpriseDTO) {
+        if(openCorpid.equals(corpid)) {
+            // 密文
+            wxEnterpriseDTO.setOpenCorpid(openCorpid);
+        }else {
+            wxEnterpriseDTO.setOpenCorpid(openCorpid);
+            wxEnterpriseDTO.setWxCorpid(corpid);
+        }
+    }
+
     @Override
     public com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo, String keyword,
             List<String> enterpriseIds, Integer gicContactFlag, String version, List<String> enterpriseIdsNotIn,
@@ -213,6 +256,11 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     }
     
     @Override
+    public WxEnterpriseQwDTO getQwInfo(String wxEnterpriseId) {
+        return this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+    }
+
+    @Override
     public WxEnterpriseDTO getEnterpriseBycorpId(String corpId) {
         TabHaobanWxEnterprise enterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
         return EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, enterprise);

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

@@ -30,6 +30,7 @@ import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.DingUtils;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreSettingDTO;
@@ -381,7 +382,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 String dthmKey = this.keyDataService.saveDataForLink(enterpriseId, bo);
                 remarkMap.put("dthmKey", dthmKey);
                 if (null != dthmKey) {
-                    ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, wxEnterpriseDTO.getCorpid(), retDTO);
+                    WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+                    ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, qwDTO.getThirdCorpid(), retDTO);
                     if (!addResp.isSuccess()) {
                         remarkMap.put("sm", "创建动态活码失败,取单人活码");
                         if (StringUtils.isBlank(hm.getWxQrcode())) {

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

@@ -14,6 +14,7 @@ import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.hm.HmClerkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeStoreDTO;
@@ -112,12 +113,11 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
     @Transactional(rollbackFor = Exception.class)
     public ServiceResponse add(HmQrcodeQDTO hmQrcodeQDTO) {
         String wxEnterpriseId = hmQrcodeQDTO.getWxEnterpriseId();
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        if (wxEnterpriseDTO == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
             logger.error("未查询到微信企业");
             return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "微信企业不存在");
         }
-
         hmQrcodeQDTO.setHmId(UniqueIdUtils.uniqueLong());
         Integer hmType = hmQrcodeQDTO.getHmType();
         Long hmId = hmQrcodeQDTO.getHmId();
@@ -142,7 +142,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         qywxExternalcontactDTO.setRemark(hmQrcodeQDTO.getName());
         qywxExternalcontactDTO.setSkipVerify(hmQrcodeQDTO.getPassFlag() == 1);
         qywxExternalcontactDTO.setState("HM" + hmId);
-        String corpid = wxEnterpriseDTO.getCorpid();
+        String corpid = qwDTO.getThirdCorpid() ;
         List<String> userIds = staffClerkRelationService.listWxUserIdByClerkIds(clerkIdList, wxEnterpriseId);
         if (CollectionUtils.isEmpty(userIds)) {
             return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "导购未关联好办");
@@ -276,8 +276,8 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
     @Transactional(rollbackFor = Exception.class)
     public ServiceResponse update(HmQrcodeQDTO hmQrcodeQDTO) {
         String wxEnterpriseId = hmQrcodeQDTO.getWxEnterpriseId();
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        if (wxEnterpriseDTO == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
             logger.error("未查询到微信企业");
             return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "微信企业不存在");
         }
@@ -304,7 +304,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "导购未关联好办");
         }
         qywxExternalcontactDTO.setUser(userIds);
-        QywxResponseDTO qywxResponseDTO = qywxUserApiService.updateContactWay(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), qywxExternalcontactDTO);
+        QywxResponseDTO qywxResponseDTO = qywxUserApiService.updateContactWay(qwDTO.getThirdCorpid(), config.getWxSuiteid(), qywxExternalcontactDTO);
         if (qywxResponseDTO.getErrcode() != 0) {
             logger.error("更新企微活码失败");
             return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_0.getCode()), qywxResponseDTO.getErrmsg());
@@ -656,8 +656,8 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
 
         String wxConfigId = hmQrcodeBO.getWxConfigId();
         if (StringUtils.isNotBlank(wxConfigId)) {
-            WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(hmQrcodeBO.getWxEnterpriseId());
-            QywxResponseDTO qywxResponseDTO = qywxUserApiService.delContactWay(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), wxConfigId);
+            WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(hmQrcodeBO.getWxEnterpriseId()) ;
+            QywxResponseDTO qywxResponseDTO = qywxUserApiService.delContactWay(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxConfigId);
             int errcode = qywxResponseDTO.getErrcode();
             if (errcode != 0) {
                 return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), qywxResponseDTO.getErrmsg());
@@ -741,8 +741,9 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
                 logger.info("该企业未与gic关联，无需开启：enterpriseId:{},wxEnterpriseId:{}", enterpriseId, wxEnterpriseId);
                 continue;
             }
+            WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
             //企微已经开启联系我
-            List<String> wxUserIdsList = qywxUserApiService.listCorpExternalUser(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid());
+            List<String> wxUserIdsList = qywxUserApiService.listCorpExternalUser(qwDTO.getThirdCorpid(), config.getWxSuiteid());
             List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listIdsByWxOpenUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
             if (CollectionUtils.isEmpty(staffClerkRelationDTOS)) {
                 logger.error("无导购关联数据");
@@ -785,10 +786,10 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
 
     @Override
     public void checkStaffOpenContactByWxEnterpriseId(String wxEnterpriseId, String enterpriseId) {
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         //查询出所有正常的导购
         //企微已经开启联系我
-        List<String> wxUserIdsList = qywxUserApiService.listCorpExternalUser(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid());
+        List<String> wxUserIdsList = qywxUserApiService.listCorpExternalUser(qwDTO.getThirdCorpid(), config.getWxSuiteid());
         List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listIdsByWxOpenUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
         if (CollectionUtils.isEmpty(staffClerkRelationDTOS)) {
             logger.error("无导购关联数据");

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

@@ -18,7 +18,6 @@ import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.manage.api.dto.DealParamMqDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
 import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
@@ -161,8 +160,7 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
 
     @Override
     public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal());
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
             logger.info("没有配置secret:{},{}", taskId, wxEnterpriseId);
             return;
@@ -174,10 +172,10 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
             List<UserDTO> list = null ;
             WxEnterpriseQwDTO wxInfo = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
             if(wxInfo.getWxSecurityType()==4) {
-                list = this.qywxUserApiService.listDepartmentUser(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(),  dataId, 1) ;
+                list = this.qywxUserApiService.listDepartmentUser(wxInfo.getThirdCorpid(), config.getWxSuiteid(),  dataId, 1) ;
                 logger.info("从(第三方)获取通讯录={}",JSON.toJSONString(list)) ;
             }else {
-                list = this.qywxUserApiService.listSelfDepartmentUser(wxEnterpriseDTO.getCorpid(), secretSetting.getSecretVal(), dataId, 1);
+                list = this.qywxUserApiService.listSelfDepartmentUser(wxInfo.getDkCorpid(), secretSetting.getSecretVal(), dataId, 1);
                 logger.info("从(代开)获取通讯录={}",JSON.toJSONString(list)) ;
             }
             if (null == list) {

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

 package com.gic.haoban.manage.service.task;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.redisson.api.RRateLimiter;
+import org.redisson.api.RateIntervalUnit;
+import org.redisson.api.RateType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.DealParamMqDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
 import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
@@ -13,26 +26,13 @@ import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.dao.mapper.WxApplicationMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
 import com.gic.haoban.manage.service.service.PreDealService;
-import com.gic.haoban.manage.service.service.SecretSettingService;
 import com.gic.haoban.manage.service.service.SyncTaskService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.QywxNewUseridDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.redisson.api.RRateLimiter;
-import org.redisson.api.RateIntervalUnit;
-import org.redisson.api.RateType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 企微通讯录同步
@@ -129,7 +129,8 @@ public class QywxStaffSyncOperation implements BaseSyncOperation {
                 dealSyncOperationApiService.unlockTask(wxEnterpriseId);
                 dealSyncOperationApiService.cleanDiffrence(wxEnterpriseId, taskId);
                 WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
-                String corpid = wxEnterpriseDTO.getCorpid();
+                WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
+                String corpid = qwDTO.getThirdCorpid() ;
                 Integer externalFlag = wxEnterpriseDTO.getExternalFlag();
                 logger.info("同步通讯录完成，批量处理wx_open_user_id，corpid：{},externalFlag:{}", corpid,externalFlag);
                 if (corpid.length() > 20 || externalFlag == 1) {

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

@@ -261,13 +261,6 @@
         and status_flag = 1
     </select>
 
-    <select id="countByDepartmentId" resultType="java.lang.Integer" parameterType="java.lang.String">
-        select count(1)
-        from tab_haoban_staff_department_related
-        where department_id = #{departmentId,jdbcType=VARCHAR}
-          and status_flag = 1
-    </select>
-
     <select id="getDepartmentIdAndCode" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>

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

@@ -355,15 +355,6 @@
         and status_flag = 1 limit 1
     </select>
 
-    <select id="selectSuperByWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_staff
-        where status_flag = 1
-        and wx_enterprise_id = #{wxEnterpriseId}
-        and super_manager_flag = 1
-    </select>
-
     <select id="listByUserIdsAndWxEnterpriseId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>

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

@@ -3,7 +3,6 @@
 <mapper namespace="com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper">
     <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise">
         <id column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
-        <result column="corpid" property="corpid" jdbcType="VARCHAR"/>
         <result column="permanent_code" property="permanentCode" jdbcType="VARCHAR"/>
         <result column="corp_name" property="corpName" jdbcType="VARCHAR"/>
         <result column="corp_type" property="corpType" jdbcType="VARCHAR"/>
@@ -42,14 +41,16 @@
         <result column="userid_flag" property="useridFlag" jdbcType="INTEGER"/>
         <result column="wx_security_type" property="wxSecurityType" jdbcType="INTEGER"/>
         <result column="auto_active_flag" property="autoActiveFlag" jdbcType="INTEGER"/>
+        <result column="wx_corpid" property="wxCorpid"/>
+        <result column="open_corpid" property="openOorpid"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        wx_enterprise_id, corpid, permanent_code, corp_name, corp_type, corp_square_logo_url,
+        wx_enterprise_id, permanent_code, corp_name, corp_type, corp_square_logo_url,
     corp_user_max, corp_full_name, subject_type, verified_end_time, corp_wxqrcode, corp_scale, 
     corp_industry, corp_sub_industry, location, auth_info, agent, agentid, appid, name, 
     square_logo_url, round_logo_url, level, bind_flag, status_flag, create_time, update_time,contact_flag,wx_secret_key,wx_secret_key_last_time,member_secret_last_time,contact_secret_last_time
-    ,member_secret,contact_secret,agree_external_userid_flag,agree_external_userid_time,external_flag,userid_flag ,wx_security_type,auto_active_flag
+    ,member_secret,contact_secret,agree_external_userid_flag,agree_external_userid_time,external_flag,userid_flag ,wx_security_type , wx_corpid , open_corpid , auto_active_flag
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
@@ -69,9 +70,6 @@
             <if test="wxEnterpriseId != null">
                 wx_enterprise_id,
             </if>
-            <if test="corpid != null">
-                corpid,
-            </if>
             <if test="permanentCode != null">
                 permanent_code,
             </if>
@@ -168,14 +166,17 @@
             <if test="useridFlag != null">
                 userid_flag,
             </if>
+            <if test="null != wxCorpid">
+            	wx_corpid ,
+            </if>
+             <if test="null != openCorpid">
+            	open_corpid ,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="wxEnterpriseId != null">
                 #{wxEnterpriseId,jdbcType=VARCHAR},
             </if>
-            <if test="corpid != null">
-                #{corpid,jdbcType=VARCHAR},
-            </if>
             <if test="permanentCode != null">
                 #{permanentCode,jdbcType=VARCHAR},
             </if>
@@ -270,16 +271,20 @@
                 #{externalFlag,jdbcType=INTEGER},
             </if>
             <if test="useridFlag != null">
-                #{useridFlag}
+                #{useridFlag} ,
+            </if>
+            <if test="null != wxCorpid">
+            	${wxCorpid} ,
+            </if>
+             <if test="null != openCorpid">
+            	${openCorpid} ,
             </if>
+            
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise">
         update tab_haoban_wx_enterprise
         <set>
-            <if test="corpid != null">
-                corpid = #{corpid,jdbcType=VARCHAR},
-            </if>
             <if test="permanentCode != null">
                 permanent_code = #{permanentCode,jdbcType=VARCHAR},
             </if>
@@ -388,6 +393,12 @@
             <if test="useridFlag != null">
                 userid_flag = #{useridFlag}
             </if>
+            <if test="null != wxCorpid">
+            	wx_corpid = #{wxCorpid}
+            </if>
+            <if test="null != openCorpid">
+            	open_corpid = #{openCorpid}
+            </if>
         </set>
         where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
     </update>
@@ -460,7 +471,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_wx_enterprise
-        where corpid= #{corpId}
+        where  wx_corpid = #{corpId} or open_corpid = #{corpid}
         <if test="statusFlag != null">
             and status_flag = #{statusFlag}
         </if>
@@ -486,9 +497,6 @@
     <update id="updateUseridFlagById">
         update tab_haoban_wx_enterprise
         set userid_flag = #{useridFlag},
-        <if test="corpid != null">
-            corpid = #{corpid},
-        </if>
         update_time = now()
         where wx_enterprise_id = #{wxEnterpriseId}
     </update>
@@ -504,7 +512,6 @@
     <select id="listAllEnterprise" resultType="com.gic.haoban.manage.api.dto.WxEnterpriseDTO" >
         select
         b.wx_enterprise_id wxEnterpriseId,
-        b.corpid corpid,
         b.corp_name corpName,
         a.enterprise_id enterpriseId
         from tab_haoban_wx_enterprise_related a

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

@@ -6,12 +6,16 @@ import java.util.List;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.redisson.api.RRateLimiter;
+import org.redisson.api.RateIntervalUnit;
+import org.redisson.api.RateType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.BasePageInfo;
+import com.gic.haoban.common.utils.DingUtils;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
@@ -22,6 +26,7 @@ import com.gic.haoban.manage.api.service.hm.HmLinkVisitLogApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
 import com.gic.haoban.manage.service.util.QwFriendLimitCountUtil;
+import com.gic.redis.data.util.RedisUtil;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = { "classpath:applicationContext-conf.xml" })
@@ -40,9 +45,52 @@ public class HmLinkTest {
     @Autowired
     private HmQrcodeApiService  hmQrcodeApiService ;
     
-    
+     volatile int x = 0 ;
     @Test
-    public void test() throws IOException {
+    public void test() throws IOException, InterruptedException {
+        
+        
+        
+        
+            for(int i=0;i<100;i++) {
+                
+                new Thread(new Runnable() {
+                    
+                    @Override
+                    public void run() {
+                        // TODO Auto-generated method stub
+                        while(true) {
+                        String ipKey = "hmadd:limit:ip";
+                        int ipLimitCount = 300;
+                        RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter(ipKey);
+                        rateLimiter.trySetRate(RateType.OVERALL, ipLimitCount, 1, RateIntervalUnit.SECONDS);
+                        if (rateLimiter.tryAcquire()) {
+                            System.err.println(x++);
+                        }else {
+                            System.err.println("**************");
+                            String msg = "活码调用次数告警【ip】";
+                            DingUtils.send(msg, false);
+                        }
+                        try {
+                            Thread.sleep(10);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        }
+                    }
+                }).start();
+                
+               
+                
+            }
+            
+            
+        
+        
+        
+            System.in.read();
+        
+        
         /*RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("hm:limit:xx");
         rateLimiter.trySetRate(RateType.OVERALL, 10, 1, RateIntervalUnit.SECONDS);
         
@@ -55,7 +103,7 @@ public class HmLinkTest {
   for(int i=0;i<100;i++)
       System.out.println(rateLimiter.tryAcquire());
   System.out.println("----" +  (System.currentTimeMillis() - start));*/
-        
+      /*  
         HmQrcodeListQDTO qdto =new HmQrcodeListQDTO();
         qdto.setClerkSelect("1");
         qdto.setStoreSelect("sele");
@@ -67,7 +115,7 @@ public class HmLinkTest {
         List<String> storeids = Arrays.asList("11");
         qdto.setStoreId(storeids);
         this.hmQrcodeApiService.listHmIdForIndex(qdto) ;
-        System.in.read();
+        System.in.read();*/
     }
     
     @Test

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

 package com.gic.haoban.manage.web.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -9,7 +20,7 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.WxApplicationDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.WxApplicationApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
@@ -17,16 +28,6 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.AdminRoleVO;
 import com.gic.haoban.manage.web.vo.AdminVO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @RestController
 public class AdminController extends WebBaseController {
@@ -35,20 +36,17 @@ public class AdminController extends WebBaseController {
     private QywxSuiteApiService qywxSuiteApiService;
     @Autowired
     private StaffApiService staffApiService;
-
     @Autowired
     private WxApplicationApiService wxApplicationApiService;
-
     @Autowired
-    private WxEnterpriseApiService wxEnterpriseApiService;
+    private WxEnterpriseApiService wxEnterpriseApiService ;
 
     @RequestMapping("admin-list")
     public HaobanResponse adminList() {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 2);
-        WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
-        String corpid = enterprise.getCorpid();
+        String corpid = application.getCorpid();
         logger.info("【管理员查询】corpid={},siteId={},agentId={}", corpid, application.getSiteId(), application.getAgentId());
         String adminList = qywxSuiteApiService.getAdminList(corpid, application.getSiteId(), Integer.parseInt(application.getAgentId()));
         logger.info("【管理员查询】userIds={}", JSON.toJSONString(adminList));
@@ -60,10 +58,11 @@ public class AdminController extends WebBaseController {
                 openUserIds.add(json.getString("userid"));
             }
         }
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
         List<StaffDTO> list = new ArrayList<>();
         List<AdminVO> resultList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(openUserIds)) {
-            if (corpid.length() > 20) {
+            if (qwDTO.needOpenUserId3th()) {
                 logger.info("OpenUserIds");
                 list = staffApiService.listByOpenUserIdsAndWxEnterpriseId(openUserIds, wxEnterpriseId);
             } else {

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

@@ -176,7 +176,7 @@ public class ApplicationController extends WebBaseController {
         String wxEnterpriseId = login.getWxEnterpriseId();
         WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
         if (enterpriseDTO != null) {
-            SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal(), null);
+            SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal(), null);
             if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
                 log.info("没有配置secret：{}", JSONObject.toJSONString(enterpriseDTO));
                 return resultResponse(HaoBanErrCode.ERR_1, true);
@@ -209,7 +209,7 @@ public class ApplicationController extends WebBaseController {
         String wxEnterpriseId = login.getWxEnterpriseId();
         WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
         if (enterpriseDTO != null) {
-            SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal(), null);
+            SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal(), null);
             if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
                 log.info("没有配置secret");
                 return resultResponse(HaoBanErrCode.ERR_1, false);
@@ -250,7 +250,7 @@ public class ApplicationController extends WebBaseController {
             applicationDTO.setAgentName(dto.getAgentName());
             applicationDTO.setSiteId(dto.getSuiteId());
             wxApplicationApiService.addSuite(applicationDTO);
-            SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal(), null);
+            SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal(), null);
             if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
                 log.info("没有配置secret：{}", JSONObject.toJSONString(enterpriseDTO));
                 return;

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

@@ -291,116 +291,6 @@ public class DepartmentContoller extends WebBaseController {
 
     }
 
-    @RequestMapping("department-repair")
-    public HaobanResponse departmentRepair(String departmentId, String parentId) {
-        DepartmentDTO dto = departmentApiService.selectById(departmentId);
-        if (dto == null || dto.getStatusFlag() == 0) {
-            return resultResponse(HaoBanErrCode.ERR_10003);
-        }
-        departmentApiService.repairRecycle(departmentId, parentId);
-        return resultResponse(HaoBanErrCode.ERR_1);
-
-    }
-
-
-    private void handerStoreClerk(String departmentId, String storeId) {
-        logger.info("【处理门店下导购】storeId={},departmentId={}", storeId, departmentId);
-        StoreDTO store = storeService.getStore(storeId);
-        DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
-        if (departmentDTO == null) {
-            logger.info("【处理门店下导购】部门为空");
-            return;
-        }
-        String wxEnterpriseId = departmentDTO.getWxEnterpriseId();
-        if (store != null) {
-            String enterpriseId = store.getEnterpriseId();
-            List<ClerkListDTO> list = clerkService.getClerkByStoreId(store.getEnterpriseId(), storeId);
-            logger.info("【处理门店下导购】list={}", JSON.toJSONString(list));
-            for (ClerkListDTO clerkListDTO : list) {
-                try {
-                    String nationcode = clerkListDTO.getNationcode();
-                    if (StringUtils.isNotBlank(nationcode) && nationcode.startsWith("+")) {
-                        nationcode = nationcode.replace("+", "");
-                    }
-                    String phoneNumber = clerkListDTO.getPhoneNumber();
-                    if (StringUtils.isBlank(phoneNumber)) {
-                        continue;
-                    }
-                    String clerkCode = clerkListDTO.getClerkCode();
-                    StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
-                    if (staff == null) {
-                        staff = new StaffDTO();
-                        staff.setNationCode(nationcode);
-                        staff.setActiveFlag(1);
-                        staff.setDepartmentIds(departmentId);
-                        staff.setBindFlag(1);
-                        staff.setClerkCode(clerkCode);
-                        staff.setNickName(clerkListDTO.getClerkName());
-                        staff.setStaffName(clerkListDTO.getClerkName());
-                        staff.setPostion(clerkListDTO.getPositionName());
-                        staff.setWxEnterpriseId(wxEnterpriseId);
-                        staff.setPhoneNumber(phoneNumber);
-                        try {
-                            staff.setSex(clerkListDTO.getClerkGender() == null ? null : Integer.parseInt(clerkListDTO.getClerkGender()));
-                        } catch (Exception e) {
-                            logger.info("【同步店员】设置性别错误sex={}", clerkListDTO.getClerkGender());
-                        }
-                        staff.setSyncPostionFlag(1);
-
-                        ServiceResponse hr = staffApiService.add(staff, departmentId);
-                        if (hr.getCode() == 1) {
-                            StaffDepartmentRelatedDTO staffRelated = staffApiService.getDepartmentIdAndStaffId(departmentId, hr.getResult().toString());
-                            StaffDepartmentRelatedDTO isCodeExist = staffApiService.getDepartmentIdAndCode(departmentId, clerkCode);
-                            if (staffRelated != null && isCodeExist == null) {
-                                staffRelated.setClerkCode(clerkCode);
-                                staffDepartmentRelatedApiService.updateById(staffRelated);
-
-                                ClerkDTO clerkDTO = clerkService.getClerkByCodeNoStatus(enterpriseId, clerkCode);
-                                if (clerkDTO != null && (!clerkDTO.getClerkName().equals(staff.getStaffName()) || !staff.getPhoneNumber().equals(clerkDTO.getPhoneNumber()))) {
-                                    logger.info("【员工修改】clerkDTO={}", JSON.toJSONString(clerkDTO));
-                                    clerkDTO.setClerkName(staff.getStaffName());
-                                    clerkDTO.setPhoneNumber(staff.getPhoneNumber());
-                                    clerkService.updateClerk(clerkDTO);
-                                }
-                            }
-                        }
-                    } else {
-                        String staffId = staff.getStaffId();
-                        List<StaffDepartmentRelatedDTO> relatedList = staffApiService.listStaffDepartmentByStaffId(staffId);
-                        String departmentIds = departmentId;
-                        for (StaffDepartmentRelatedDTO staffDepartmentRelatedDTO : relatedList) {
-                            departmentIds += "," + staffDepartmentRelatedDTO.getDepartmentId();
-                        }
-                        Map<String, StaffDepartmentRelatedDTO> map = com.gic.commons.util.CollectionUtil.toMap(relatedList, "departmentId");
-                        if (map.get(departmentId) == null) {
-                            staffApiService.staffEdit(staff, departmentIds);
-                        }
-                        StaffDepartmentRelatedDTO staffRelated = staffApiService.getDepartmentIdAndStaffId(departmentId, staffId);
-                        //如果这个人是未绑定的 则绑定clerk
-                        StaffDepartmentRelatedDTO isCodeExist = staffApiService.getDepartmentIdAndCode(departmentId, clerkCode);
-                        if (StringUtils.isBlank(staffRelated.getClerkCode()) && isCodeExist == null) {
-                            ClerkDTO clerkDTO = clerkService.getClerkByCodeNoStatus(enterpriseId, clerkCode);
-                            if (clerkDTO != null && (!clerkDTO.getClerkName().equals(staff.getStaffName()) || !staff.getPhoneNumber().equals(clerkDTO.getPhoneNumber()))) {
-                                logger.info("【员工修改】clerkDTO={}", JSON.toJSONString(clerkDTO));
-                                clerkDTO.setClerkName(staff.getStaffName());
-                                clerkDTO.setPhoneNumber(staff.getPhoneNumber());
-                                clerkService.updateClerk(clerkDTO);
-                            }
-
-                            staffRelated.setClerkCode(clerkCode);
-                            staffDepartmentRelatedApiService.updateById(staffRelated);
-                        }
-                    }
-                } catch (Exception e) {
-                    logger.info("同步失败");
-                }
-            }
-        } else {
-            logger.info("【处理门店下导购】门店为空");
-        }
-
-    }
-
 
     @RequestMapping("department-cache")
     public HaobanResponse departmentCache(String wxEnterpriseId) {

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

 package com.gic.haoban.manage.web.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -18,30 +38,36 @@ import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkBindLogDetailDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkInfoDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+import com.gic.haoban.manage.api.dto.WxApplicationDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.HaobanUserApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.service.WxApplicationApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.StaffEditJsonQO;
 import com.gic.haoban.manage.web.vo.ClerkInfoVo;
 import com.gic.haoban.manage.web.vo.StaffExportVO;
 import com.gic.haoban.manage.web.vo.StaffVO;
-import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Lists;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollectionUtil;
 
 
 @RestController
@@ -73,8 +99,6 @@ public class StaffController extends WebBaseController {
     @Autowired
     private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
     @Autowired
-    private QywxSuiteApiService qywxSuiteApiService;
-    @Autowired
     private HaobanUserApiService haobanUserApiService ;
     @Autowired
     private DealSyncOperationApiService dealSyncOperationApiService;
@@ -88,28 +112,6 @@ public class StaffController extends WebBaseController {
         return this.success(null) ;
     }
     
-    @RequestMapping("staff-add")
-    public HaobanResponse staffAdd(StaffDTO staffDTO, String departmentIds) {
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = login.getWxEnterpriseId();
-        String staffName = staffDTO.getStaffName();
-        String phoneNumber = staffDTO.getPhoneNumber();
-        String nationcode = staffDTO.getNationCode();
-        staffDTO.setWxEnterpriseId(wxEnterpriseId);
-        if (StringUtils.isBlank(staffName)) {
-            return resultResponse(HaoBanErrCode.ERR_10004);
-        }
-        StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
-        if (staff != null) {
-            return resultResponse(HaoBanErrCode.ERR_10005);
-        }
-        ServiceResponse hr = staffApiService.add(staffDTO, departmentIds);
-        if (hr.getCode() == 0) {
-            return resultResponse(HaoBanErrCode.ERR_DEFINE, hr.getMessage(), null, hr.getMessage());
-        }
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
     @RequestMapping("staff-sel")
     public HaobanResponse staffSel(String staffId) {
         StaffDTO staff = staffApiService.selectById(staffId);
@@ -159,44 +161,6 @@ public class StaffController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, PageUtil.getPageInfo(page));
     }
 
-    @RequestMapping("staff-del")
-    public HaobanResponse staffDel(String staffDepartmentStaffRelatedId) {
-        StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentStaffRelatedId);
-        if (related == null) {
-            return resultResponse(HaoBanErrCode.ERR_8);
-        }
-        DepartmentDTO department = departmentApiService.selectById(related.getDepartmentId());
-        if (department.getTempFlag() != null && department.getTempFlag() == 1) {
-            return resultResponse(HaoBanErrCode.ERR_10014);
-        }
-        staffApiService.del(staffDepartmentStaffRelatedId);
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
-    @RequestMapping("staff-batch-del")
-    public HaobanResponse staffBatchDel(String staffDepartmentRelatedIds) {
-        if (StringUtils.isBlank(staffDepartmentRelatedIds)) {
-            return resultResponse(HaoBanErrCode.ERR_2);
-        }
-        String[] staffArr = staffDepartmentRelatedIds.split(",");
-        int size = staffArr.length;
-        for (String string : staffArr) {
-            StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(string);
-            if (related == null) {
-                continue;
-            }
-            DepartmentDTO department = departmentApiService.selectById(related.getDepartmentId());
-            if (department.getTempFlag() != null && department.getTempFlag() == 1) {
-                if (size == 1) {
-                    return resultResponse(HaoBanErrCode.ERR_10014);
-                }
-                continue;
-            }
-            staffApiService.del(string);
-        }
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
     @RequestMapping("staff-edit")
     public HaobanResponse staffEdit(StaffDTO staffDTO, String departmentIds) {
         String staffId = staffDTO.getStaffId();
@@ -231,12 +195,9 @@ public class StaffController extends WebBaseController {
                 userArr.add(userId);
             }
         }
-        WxEnterpriseDTO enterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
         WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 1);
-        if (enterpriseDTO != null) {
         if (application != null) {
-                qywxUserApiService.inviteUser(enterpriseDTO.getCorpid(), application.getSiteId(), userArr);
-            }
+            qywxUserApiService.inviteUser(application.getCorpid(), application.getSiteId(), userArr);
         }
         return resultResponse(HaoBanErrCode.ERR_1);
 

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

@@ -159,7 +159,8 @@ public class WxEnterpriseController extends WebBaseController {
         if (wxEnterpriseDTO == null) {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }
-        QywxCorpInfoDTO dto = qywxTokenManageService.getCorpInfo(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid());
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
+        QywxCorpInfoDTO dto = qywxTokenManageService.getCorpInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid());
         if (dto == null) {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }
@@ -291,7 +292,7 @@ public class WxEnterpriseController extends WebBaseController {
         if (CollectionUtils.isEmpty(secretTypeList)) {
             return resultResponse(HaoBanErrCode.ERR_1, false);
         }
-        if ((secretTypeList.contains(SecretTypeEnum.HAOBAN_HELP.getVal()) || secretTypeList.contains(SecretTypeEnum.CUSTOMIZED_APP.getVal()))
+        if ((secretTypeList.contains(SecretTypeEnum.CUSTOMIZED_APP.getVal()))
                 && secretTypeList.contains(SecretTypeEnum.CONTACT_CUSTOMER.getVal())) {
             return resultResponse(HaoBanErrCode.ERR_1, true);
         } else {
@@ -302,47 +303,6 @@ public class WxEnterpriseController extends WebBaseController {
     /**
      * 微信企业绑定接口绑定通讯录key
      *
-     * @param contactSecret
-     * @return
-     */
-    @RequestMapping("wx-enterprise-contact-secret-set")
-    public HaobanResponse wxEnterpriseSecretSet(String contactSecret) {
-        if (StringUtils.isBlank(contactSecret)) {
-            return resultResponse(HaoBanErrCode.ERR_2);
-        }
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = login.getWxEnterpriseId();
-        WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
-        if (wxEnterprise == null) {
-            return resultResponse(HaoBanErrCode.ERR_10012);
-        }
-        contactSecret = contactSecret.trim();
-
-        UserDTO user = qywxUserApiService.getSelfWorkWxUser(wxEnterprise.getCorpid(), contactSecret, getWxUserId(wxEnterpriseId, login));
-        logger.info("【保存联系人key】user={}", JSON.toJSONString(user));
-        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_SECRET.getVal(), null);
-        if (null == secretSetting) {
-            secretSetting = new SecretSettingDTO();
-        }
-        secretSetting.setSecretType(SecretTypeEnum.CONTACT_SECRET.getVal());
-        secretSetting.setSecretName(SecretTypeEnum.CONTACT_SECRET.getName());
-        secretSetting.setWxEnterpriseId(wxEnterpriseId);
-        secretSetting.setEnterpriseId("-1");
-        if (user != null) {
-            secretSetting.setSecretVal(contactSecret);
-            secretSetting.setCheckFlag(1);
-            wxEnterpriseApiService.saveSecretSetting(secretSetting);
-            return resultResponse(HaoBanErrCode.ERR_1, true);
-        } else {
-            secretSetting.setCheckFlag(0);
-            wxEnterpriseApiService.saveSecretSetting(secretSetting);
-            return resultResponse(HaoBanErrCode.ERR_10013);
-        }
-    }
-
-    /**
-     * 微信企业绑定接口绑定通讯录key
-     *
      * @param wxSecretKey
      * @return
      */
@@ -353,12 +313,12 @@ public class WxEnterpriseController extends WebBaseController {
         }
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
-        WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
-        if (wxEnterprise == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }
         wxSecretKey = wxSecretKey.trim();
-        String res = qywxUserApiService.listSelfExternalUserid(wxEnterprise.getCorpid(), wxSecretKey, getWxUserId(wxEnterpriseId, login));
+        String res = qywxUserApiService.listSelfExternalUserid(qwDTO.getThirdCorpid(), wxSecretKey, getWxUserId(wxEnterpriseId, login));
         logger.info("【保存联系人key】res={}", res);
         SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal(), null);
         if (null == secretSetting) {
@@ -399,7 +359,8 @@ public class WxEnterpriseController extends WebBaseController {
         if (StringUtils.isBlank(secretId)) {
             secretSetting = new SecretSettingDTO();
         }
-        UserDTO user = qywxUserApiService.getSelfWorkWxUser(wxEnterprise.getCorpid(), memberSecret, getWxUserId(wxEnterpriseId, login));
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
+        UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getMemberCorpid(), memberSecret, getWxUserId(wxEnterpriseId, login));
         secretSetting.setSecretType(SecretTypeEnum.MEMBER_WAPP.getVal());
         secretSetting.setSecretName(secretName);
         secretSetting.setEnterpriseId(enterpriseId);
@@ -430,53 +391,6 @@ public class WxEnterpriseController extends WebBaseController {
     }
 
     /**
-     * 微信企业绑定接口绑定通讯录key(好办助手)
-     *
-     * @param contactSecret
-     * @param memberSecret
-     * @return
-     */
-    @RequestMapping("wx-enterprise-haoban-secret-set")
-    public HaobanResponse wxEnterpriseHaobanSecretSet(String contactSecret, String memberSecret) {
-        if (StringUtils.isNotBlank(memberSecret)) {
-            contactSecret = memberSecret;
-        }
-        if (StringUtils.isAnyBlank(contactSecret)) {
-            return resultResponse(HaoBanErrCode.ERR_2);
-        }
-        String wxEnterpriseId = "";
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        wxEnterpriseId = login.getWxEnterpriseId();
-        WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
-        if (wxEnterprise == null) {
-            return resultResponse(HaoBanErrCode.ERR_10012);
-        }
-        contactSecret = contactSecret.trim();
-
-        UserDTO user = qywxUserApiService.getSelfWorkWxUser(wxEnterprise.getCorpid(), contactSecret, getWxUserId(wxEnterpriseId, login));
-        logger.info("【保存联系人key】user={}", JSON.toJSONString(user));
-        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal(), null);
-        if (null == secretSetting) {
-            secretSetting = new SecretSettingDTO();
-        }
-        secretSetting.setSecretType(SecretTypeEnum.HAOBAN_HELP.getVal());
-        secretSetting.setSecretName(SecretTypeEnum.HAOBAN_HELP.getName());
-        secretSetting.setWxEnterpriseId(wxEnterpriseId);
-        secretSetting.setEnterpriseId("-1");
-        if (user != null) {
-            secretSetting.setSecretVal(contactSecret);
-            secretSetting.setCheckFlag(1);
-            wxEnterpriseApiService.saveSecretSetting(secretSetting);
-            return resultResponse(HaoBanErrCode.ERR_1, true);
-        } else {
-            secretSetting.setCheckFlag(0);
-            wxEnterpriseApiService.saveSecretSetting(secretSetting);
-            return resultResponse(HaoBanErrCode.ERR_10013);
-        }
-    }
-
-
-    /**
      * 企微相关密钥列表
      *
      * @return

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

@@ -80,12 +80,8 @@ public class ClerkController extends WebBaseController {
     private AuditSettingApiService auditSettingApiService;
     @Autowired
     private DealSyncOperationApiService dealSyncOperationApiService;
-
     @Autowired
     private ExternalClerkRelatedApiService externalClerkRelatedApiService;
-
-    @Autowired
-    private OperationSettingApiService operationSettingApiService;
     @Autowired
     private CustomerApiService customerApiService;
     @Autowired
@@ -1238,13 +1234,13 @@ public class ClerkController extends WebBaseController {
         if (StringUtils.isNotBlank(wxOpenId)) {
             return RestResponse.successResult(wxOpenId);
         }
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
-        if (wxEnterpriseDTO == null) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
             int code = HaoBanErrCode.ERR_400002.getCode();
             return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_400002.getMsg());
         }
         String wxUserId = staffDTO.getWxUserId();
-        String openid = qywxUserApiService.getSelfOpenIdByUserId(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), wxUserId);
+        String openid = qywxUserApiService.getSelfOpenIdByUserId(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxUserId);
         if (StringUtils.isBlank(openid)) {
             int code = HaoBanErrCode.ERR_600003.getCode();
             return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_600003.getMsg());

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

@@ -172,8 +172,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
         }
 
         String wxEnterpriseId = loginStaff.getWxEnterpriseId();
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
-        String accesstoken = qywxCorpApiService.getCorpAccessToken(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid());
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
+        String accesstoken = qywxCorpApiService.getCorpAccessToken(qwDTO.getThirdCorpid(), config.getWxSuiteid());
         WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
         wellDoneLoginInfoVo.setAccessToken(accesstoken);
         wellDoneLoginInfoVo.setStaffId(staffId);
@@ -342,9 +342,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
             logger.info("该企业不存在wxEnterpriseId={}", wxEnterpriseId);
             return resultResponse(HaoBanErrCode.ERR_400002);
         }
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
         MemberLoginQo user = new MemberLoginQo();
         if (StringUtils.isBlank(qo.getUserId())) {
-            user = getUserByCode(enterpriseDTO, qo.getCode(), qo.getGicEnterpriseId());
+            user = getUserByCode(wxEnterpriseId ,qwDTO.getThirdCorpid() , qo.getCode(), qo.getGicEnterpriseId());
             if (user == null) {
                 logger.info("登录失败,从微信获取用户信息失败");
                 return resultResponse(HaoBanErrCode.ERR_6);
@@ -355,10 +356,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
                 logger.info("该企业不存在corpid={},{}", user.getCorpId(), wxApplicationDTO.getWxEnterpriseId());
                 return resultResponse(HaoBanErrCode.ERR_400002);
             }
-            if (!wxEnterpriseDTO.getCorpid().equals(enterpriseDTO.getCorpid())) {
-                logger.info("{},{}", wxEnterpriseDTO.getCorpid(), enterpriseDTO.getCorpid());
-                return resultResponse(HaoBanErrCode.ERR_500003, wxEnterpriseDTO.getCorpid());
-            }
         } else {
             user.setUserId(qo.getUserId());
         }
@@ -416,13 +413,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, user);
     }
 
-    private MemberLoginQo getUserByCode(WxEnterpriseDTO enterpriseDTO, String code, String enterpriseId) {
-        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
+    private MemberLoginQo getUserByCode(String wxEnterpriseId ,String corpid, String code, String enterpriseId) {
+        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
         if (null == secretSetting || StringUtils.isBlank(secretSetting.getSecretVal())) {
-            logger.info("MEMBER_WAPPsecret没有配置{},{}", enterpriseDTO.getWxEnterpriseId(), enterpriseId);
+            logger.info("MEMBER_WAPPsecret没有配置{},{}", wxEnterpriseId, enterpriseId);
             return null;
         }
-        String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), code);
+        String userDTOJson = qywxUserApiService.getUserByCode(corpid, secretSetting.getSecretVal(), code);
         logger.info("会员微信登录信息=============>{}", userDTOJson);
         return JSON.parseObject(userDTOJson, MemberLoginQo.class);
     }