Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -22,10 +22,12 @@ 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.haoban.manage.service.service.DepartmentService;
+import com.gic.haoban.manage.service.service.MiniprogramSettingService;
+import com.gic.haoban.manage.service.service.StoreRangeService;
+import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
 import com.google.common.collect.Sets;
@@ -58,14 +60,10 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     @Autowired
     private DepartmentService departmentService;
     @Autowired
-    private StaffService staffService;
-    @Autowired
     private MiniprogramSettingService miniprogramSettingService;
     @Autowired
     private AuthorizeService authorizeService;
     @Autowired
-    private StaffMapper staffMapper;
-    @Autowired
     private EnterpriseService enterpriseService;
     @Autowired
     private StoreRangeService storeRangeService;
@@ -74,7 +72,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     @Autowired
     private RightService rightService;
     @Autowired
-    private ClerkService clerkService ;
+    private ClerkService clerkService;
 
     /**
      * 查询好办所有的企业id
@@ -88,36 +86,36 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 
     @Override
     public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId) {
-        return this.listEnterpriseByWxEnterpriseId(wxEnterpriseId, null,false) ;
+        return this.listEnterpriseByWxEnterpriseId(wxEnterpriseId, null, false);
     }
 
     @Override
     public EnterpriseDetailDTO getByEnterpriseId(String wxEnterpriseId, String enterpriseId) {
         TabHaobanWxEnterpriseRelated entity = wxEnterpriseRelatedService.getByEnterpriseId(wxEnterpriseId, enterpriseId);
         EnterpriseDetailDTO dto = EntityUtil.changeEntityByJSON(EnterpriseDetailDTO.class, entity);
-        return dto ;
+        return dto;
     }
 
     @Override
     public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseIdList(List<String> wxEnterpriseIdList) {
-        List<TabHaobanWxEnterpriseRelated> relatedList = this.wxEnterpriseRelatedMapper.listByWxenterpriseIdList(wxEnterpriseIdList) ;
-        if(CollectionUtils.isNotEmpty(relatedList)) {
+        List<TabHaobanWxEnterpriseRelated> relatedList = this.wxEnterpriseRelatedMapper.listByWxenterpriseIdList(wxEnterpriseIdList);
+        if (CollectionUtils.isNotEmpty(relatedList)) {
             List<EnterpriseDetailDTO> list = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
-            for(EnterpriseDetailDTO item : list) {
-                String enterpriseId = item.getEnterpriseId() ;
-                EnterpriseDTO en = this.enterpriseService.getEnterpriseById(enterpriseId) ;
-                if(null != en) {
+            for (EnterpriseDetailDTO item : list) {
+                String enterpriseId = item.getEnterpriseId();
+                EnterpriseDTO en = this.enterpriseService.getEnterpriseById(enterpriseId);
+                if (null != en) {
                     item.setEnterpriseName(en.getBrandName());
                 }
             }
-            return list ;
+            return list;
         }
         return null;
     }
 
     @Override
-    public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId, String phoneNumber,boolean filterFlag) {
-        logger.info("listEnterpriseByWxEnterpriseId,wxeid={},phone={}",wxEnterpriseId,phoneNumber);
+    public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId, String phoneNumber, boolean filterFlag) {
+        logger.info("listEnterpriseByWxEnterpriseId,wxeid={},phone={}", wxEnterpriseId, phoneNumber);
         List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
         List<EnterpriseDetailDTO> list = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
         if (CollectionUtils.isEmpty(list)) {
@@ -126,9 +124,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         List<String> enterpriseIds = list.stream().map(s -> s.getEnterpriseId()).collect(Collectors.toList());
         List<EnterpriseDTO> enterpriseList = enterpriseService.listEnterpriseByIds(enterpriseIds);
         Map<String, EnterpriseDTO> map = com.gic.commons.util.CollectionUtil.toMap(enterpriseList, "enterpriseId");
-        Iterator<EnterpriseDetailDTO> it = list.iterator() ;
-        while(it.hasNext()) {
-            EnterpriseDetailDTO dto = it.next() ;
+        Iterator<EnterpriseDetailDTO> it = list.iterator();
+        while (it.hasNext()) {
+            EnterpriseDetailDTO dto = it.next();
             EnterpriseDTO enterpriseDTO = map.get(dto.getEnterpriseId());
             if (enterpriseDTO != null) {
                 dto.setEnterpriseName(enterpriseDTO.getEnterpriseName());
@@ -137,11 +135,11 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
                 dto.setConactsPhone(enterpriseDTO.getConactsPhone());
                 dto.setCustomerPhone(enterpriseDTO.getCustomerPhone());
                 dto.setAclFlag(1);
-                if(StringUtils.isNotBlank(phoneNumber)) {
-                    com.gic.api.base.commons.ServiceResponse<Boolean> resp = this.rightService.hasHaobanAcl(enterpriseDTO.getEnterpriseId(), phoneNumber) ;
-                    if(!resp.getResult()) {
+                if (StringUtils.isNotBlank(phoneNumber)) {
+                    com.gic.api.base.commons.ServiceResponse<Boolean> resp = this.rightService.hasHaobanAcl(enterpriseDTO.getEnterpriseId(), phoneNumber);
+                    if (!resp.getResult()) {
                         dto.setAclFlag(0);
-                        if(filterFlag) {
+                        if (filterFlag) {
                             it.remove();
                         }
                     }
@@ -227,7 +225,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         }
         EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
         if (enterpriseDTO == null) {
-            logger.info("该企业为空：{}",enterpriseId);
+            logger.info("该企业为空：{}", enterpriseId);
             resp.setCode(2);
             resp.setMessage("该企业为空");
             return resp;
@@ -424,7 +422,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 
         // 获取所有门店信息
         List<StoreSimpleDTO> storeDtos = storeService.listSimpleStore(enterpriseId, null, null);
-        logger.info("所有门店数={},{}",enterpriseId,storeDtos.size());
+        logger.info("所有门店数={},{}", enterpriseId, storeDtos.size());
         Map<String, List<String>> storeMapByGroupId = storeDtos.stream().filter(dto -> StringUtils.isNotBlank(dto.getStoreGroupId())).collect(Collectors.groupingBy(dto -> dto.getStoreGroupId(), Collectors.mapping(dto -> dto.getStoreId(), Collectors.toList())));
         Map<String, StoreSimpleDTO> storeIdMap = storeDtos.stream().collect(Collectors.toMap(dto -> dto.getStoreId(), dto -> dto));
 
@@ -517,23 +515,23 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     public List<WxEnterpriseDTO> listWxEnterpriseByEid(String enterpriseId, String clerkPhoneNumber) {
         List<WxEnterpriseDTO> list = new ArrayList<>();
         ClerkDTO clerk = this.clerkService.getUserByPhoneNumber(clerkPhoneNumber, enterpriseId);
-        if(null == clerk || (StringUtils.isBlank(clerk.getHbEnt()) && null != clerk.getSuperAdmin() && 0==clerk.getSuperAdmin())) {
-            logger.info("导购校验不通过,不存在或hbEnt为空,clerkPhoneNumber={},eid={}",clerkPhoneNumber,enterpriseId);
-            return  list ;
+        if (null == clerk || (StringUtils.isBlank(clerk.getHbEnt()) && null != clerk.getSuperAdmin() && 0 == clerk.getSuperAdmin())) {
+            logger.info("导购校验不通过,不存在或hbEnt为空,clerkPhoneNumber={},eid={}", clerkPhoneNumber, enterpriseId);
+            return list;
         }
-        List<WxEnterpriseDTO>  dtoList  =  this.listWxEnterpriseByEid(enterpriseId) ;
-        logger.info("用户管辖微信企业phone={},hbEnt={},dtoList={},super={}",clerkPhoneNumber,clerk.getHbEnt(),JSON.toJSONString(dtoList),clerk.getSuperAdmin());
-        if(CollectionUtils.isEmpty(dtoList)) {
-            return list ;
+        List<WxEnterpriseDTO> dtoList = this.listWxEnterpriseByEid(enterpriseId);
+        logger.info("用户管辖微信企业phone={},hbEnt={},dtoList={},super={}", clerkPhoneNumber, clerk.getHbEnt(), JSON.toJSONString(dtoList), clerk.getSuperAdmin());
+        if (CollectionUtils.isEmpty(dtoList)) {
+            return list;
         }
-        if(null != clerk.getSuperAdmin() && 0 == clerk.getSuperAdmin()) {
-            for(WxEnterpriseDTO item : dtoList) {
-                if(clerk.getHbEnt().contains(item.getWxEnterpriseId())) {
-                    list.add(item) ;
+        if (null != clerk.getSuperAdmin() && 0 == clerk.getSuperAdmin()) {
+            for (WxEnterpriseDTO item : dtoList) {
+                if (clerk.getHbEnt().contains(item.getWxEnterpriseId())) {
+                    list.add(item);
                 }
             }
-        }else {
-            return dtoList ;
+        } else {
+            return dtoList;
         }
         return list;
     }
@@ -642,17 +640,13 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         if (tabHaobanWxEnterpriseRelated == null) {
             return false;
         }
-     /*   if (tabHaobanWxEnterpriseRelated.getWxEnterpriseType() == 1) {
-            logger.info("非总部不能设置好友");
-            return false;
-        }*/
         wxEnterpriseRelatedService.setClerkEdit(wxEnterprieseRelatedId, clerkEditFlag);
         return true;
     }
 
     @Override
     public void saveClerkEditFlag(String wxEnterpriseId, String enterpriseId, int value) {
-        this.wxEnterpriseRelatedMapper.saveClerkEditFlag(wxEnterpriseId,enterpriseId,value) ;
+        this.wxEnterpriseRelatedMapper.saveClerkEditFlag(wxEnterpriseId, enterpriseId, value);
     }
 
     @Override
@@ -672,10 +666,10 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 
     @Override
     public List<String> listStoreIdByName(String wxEnterpriseId, String enterpriseId, String storeName) {
-        if(StringUtils.isAnyBlank(wxEnterpriseId,enterpriseId,storeName)) {
-            return null ;
+        if (StringUtils.isAnyBlank(wxEnterpriseId, enterpriseId, storeName)) {
+            return null;
         }
-        return this.storeRangeService.listStoreIdByName(wxEnterpriseId, enterpriseId,storeName);
+        return this.storeRangeService.listStoreIdByName(wxEnterpriseId, enterpriseId, storeName);
     }
 
     /**
@@ -689,13 +683,13 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     public com.gic.api.base.commons.ServiceResponse<EnterpriseDetailDTO> queryEnterpriseDetail(String wxEnterpriseId, String enterpriseId) {
 
         TabHaobanWxEnterpriseRelated oneByEnterpriseId = wxEnterpriseRelatedMapper.findOneByEIdAndWxEid(enterpriseId, wxEnterpriseId);
-        if (oneByEnterpriseId == null){
-            return com.gic.api.base.commons.ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode()+"", HaoBanErrCodeCommon.ERR_8.getMsg());
+        if (oneByEnterpriseId == null) {
+            return com.gic.api.base.commons.ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
         }
         EnterpriseDetailDTO enterpriseDetailDTO = EntityUtil.changeEntity(EnterpriseDetailDTO.class, oneByEnterpriseId);
         EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
-        if (enterprise == null){
-            return  com.gic.api.base.commons.ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode()+"", HaoBanErrCodeCommon.ERR_8.getMsg());
+        if (enterprise == null) {
+            return com.gic.api.base.commons.ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
         }
         enterpriseDetailDTO.setEnterpriseName(enterprise.getEnterpriseName());
         enterpriseDetailDTO.setEnterpriseLogo(enterprise.getQcloudImageUrl());