fix:删除无效代码

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

@@ -14,7 +14,6 @@ import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
-import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
@@ -45,8 +44,6 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
     @Autowired
     private TabHaobanStaffClerkRelationMapper staffClerkRelationMapper;
-    @Autowired
-    private StaffMapper staffMapper;
 
     /**
      * 查询导购好友关联

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.commons.util.ToolUtil;
 import com.gic.enterprise.api.dto.*;
 import com.gic.enterprise.api.service.AuthorizeService;
+import com.gic.enterprise.api.service.EnterpriseService;
+import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
+import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.service.*;
 import com.gic.mq.sdk.GicMQClient;
@@ -28,16 +30,12 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.gic.commons.util.EntityUtil;
-import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.enterprise.api.service.StoreGroupService;
-import com.gic.haoban.common.utils.UuidUtil;
-import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
-import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
-import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
 @Service
 public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApiService {
     private static final Logger logger = LogManager.getLogger(WxEnterpriseRelatedApiServiceImpl.class);
@@ -86,82 +84,32 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 		return wxEnterpriseRelatedMapper.findAllEnterpriseId();
 	}
 
-
-	//获取门店详情
-	public boolean isEnterpriseOver(String eid) {
-
-		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(eid);
-		if(enterprise == null || enterprise.getExpireTime() == null){
-			return false;
-		}
-		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
-			return false;
-		}
-		return true;
-
-	}
-
 	@Override
 	public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(
 			String wxEnterpriseId) {
-		
 		List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
 		List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
 		if (CollectionUtils.isEmpty(result)){
 			return result;
 		}
-//		for (EnterpriseDetailDTO enterpriseDetailDTO : result) {
-//			String enterpriseId = enterpriseDetailDTO.getEnterpriseId();
-//			int gicAllCount = storeGroupService.gicDepartmentCount(enterpriseId);
-//			int syncCount = departmentService.countSyncDepartmentByEnterpriseId(enterpriseId);
-//			logger.info("【企业数量】gicAllCount={},syncCount={}",gicAllCount,syncCount);
-//			int nodeCount = gicAllCount - syncCount;
-//			enterpriseDetailDTO.setNodeCount(nodeCount);
-//		}
 		return result;
 	}
-	
-//	public int getNodeCount(String enterpriseId,String parentId,int type) {
-//		int nodeCount = 0;
-//		List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,type, parentId);
-//		for (GicTreeDTO gicTreeDTO : departmentList) {
-//			if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) {
-//				nodeCount ++;
-//			}
-//			List<GicTreeDTO> departmentList2 = storeGroupService.listGicTree(enterpriseId,gicTreeDTO.getType(), gicTreeDTO.getId());
-//			while(!departmentList2.isEmpty()) {
-//				for (GicTreeDTO gicTreeDTO2 : departmentList) {
-//					nodeCount += getNodeCount(enterpriseId,gicTreeDTO2.getId(),gicTreeDTO2.getType());
-//				}
-//			}
-//		}
-//		
-//		return nodeCount;
-//		
-//	}
 
 	@Override
 	public String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId) {
 		TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedService.getByGicEnterpriseIdByEnterpriseRelatedId(wxEnterpriseRelatedId);
-		if(tab != null) {
-			return tab.getEnterpriseId();
-		}
-		
-		return null;
+		return tab != null ? tab.getEnterpriseId() : null;
 	}
 
 	@Override
 	public boolean enterpriseUseNew(String enterpriseId) {
-        if (null == enterpriseId) {
-            return false;
-        }
-        List<String> eids = new ArrayList<>();
-        eids.add(enterpriseId);
-        List<TabHaobanWxEnterpriseRelated> retList = wxEnterpriseRelatedMapper.listEnterpriseByEnterpriseIds(eids);
-        if (CollectionUtils.isEmpty(retList)) {
-            return false;
+		if (null == enterpriseId) {
+			return false;
 		}
-		return true;
+		List<String> eids = new ArrayList<>();
+		eids.add(enterpriseId);
+		List<TabHaobanWxEnterpriseRelated> retList = wxEnterpriseRelatedMapper.listEnterpriseByEnterpriseIds(eids);
+		return !CollectionUtils.isEmpty(retList);
 	}
 
 	@Override
@@ -320,10 +268,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 		if (tab == null) {
 			return true;
 		}
-		if (detailDTO.getWxEnterpriseRelatedId() != null && tab.getWxEnterpriseRelatedId().equals(detailDTO.getWxEnterpriseRelatedId())) {
-			return true;
-		}
-		return false;
+		return detailDTO.getWxEnterpriseRelatedId() != null && tab.getWxEnterpriseRelatedId().equals(detailDTO.getWxEnterpriseRelatedId());
 
 	}
 
@@ -343,10 +288,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 		}
 		logger.info("绑定的部分：{}，{}", detailDTO.getWxEnterpriseId(), JSONObject.toJSONString(storeRanges));
 		Set<TabStoreRange> mid = storeRanges.stream().filter(tab -> !tab.getWxEnterpriseId().equals(detailDTO.getWxEnterpriseId())).collect(Collectors.toSet());
-		if (CollectionUtils.isEmpty(mid)) {
-			return true;
-		}
-		return false;
+		return CollectionUtils.isEmpty(mid);
 	}
 
 	@Override