Merge branch 'developer' into 'master'

Developer

See merge request !80

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

@@ -2,7 +2,9 @@ package com.gic.haoban.manage.service.service.out.impl;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,12 +41,34 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 	private StaffService staffService;
 	@Autowired
 	private StaffMapper staffMapper;
+
+	@Autowired
+	private EnterpriseService enterpriseService;
+
+
+	//获取门店详情
+	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);

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

@@ -7,14 +7,16 @@ import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkNewService;
 import com.gic.clerk.api.service.ClerkService;
-import com.gic.enterprise.api.dto.StoreDTO;
-import com.gic.enterprise.api.service.StoreService;
+import com.gic.enterprise.api.dto.*;
+import com.gic.enterprise.api.service.*;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.enums.BindTypeEnum;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.service.*;
@@ -69,6 +71,9 @@ public class StaffController extends WebBaseController{
 
 	@Autowired
 	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+
+	@Autowired
+	private EnterpriseService enterpriseService;
 	
 	@RequestMapping("staff-add")
 	public HaobanResponse staffAdd(StaffDTO staffDTO,String departmentIds){
@@ -302,6 +307,20 @@ public class StaffController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,b);
 	}
 
+	//获取门店详情
+	public boolean isEnterpriseOver(String eid) {
+
+		com.gic.enterprise.api.dto.EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(eid);
+		if(enterprise == null || enterprise.getExpireTime() == null){
+			return false;
+		}
+		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
+			return false;
+		}
+		return true;
+
+	}
+
 	/**
 	 * 成员关联关系搜索接口
 	 * @param search
@@ -318,7 +337,10 @@ public class StaffController extends WebBaseController{
 		if (CollectionUtil.isEmpty(list)) {
 			return resultResponse(HaoBanErrCode.ERR_10010);
 		}
-		List<String> enterpriseIds = list.stream().map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
+		List<String> enterpriseIds = list.stream().filter(dto->{
+			boolean over = isEnterpriseOver(dto.getEnterpriseId());
+			return !over;
+		}).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
 
 		List<ClerkDTO> clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIds, search);
 		List<ClerkInfoVo> retList = EntityUtil.changeEntityListByJSON(ClerkInfoVo.class, clerkDTOList);

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

@@ -408,6 +408,21 @@ public class ClerkController extends WebBaseController{
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
+
+	//获取门店详情
+	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;
+
+	}
+
 	//精确查，根据手机号或者code，查找
 	@RequestMapping("query-clerk-list-by-code")
 	public HaobanResponse queryClerkListByCode(String keyword,String wxEnterpriseId){
@@ -418,7 +433,10 @@ public class ClerkController extends WebBaseController{
 		if(list == null || list.isEmpty()){
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
-		List<String> enterpriseIdList = list.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
+		List<String> enterpriseIdList = list.stream().filter(s->{
+			boolean over = isEnterpriseOver(s.getEnterpriseId());
+			return !over;
+		}).map(s->s.getEnterpriseId()).collect(Collectors.toList());
 		List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList,  keyword);
 		List<ClerkStoreVO> clerkStoreList = new ArrayList<>();
 		if(CollectionUtil.isEmpty(clerkList)){

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

@@ -102,6 +102,11 @@ public class StoreController extends WebBaseController{
 			ClerkMainStoreRelatedDTO mainDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId);
 			String storeId = mainDTO == null?"":mainDTO.getStoreId();
 			for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
+				boolean enterpriseOver = isEnterpriseOver(staffClerkRelationDTO.getStoreId());
+				if (enterpriseOver) {
+					logger.info("该企业过期了：{},{},{}",staffId,staffClerkRelationDTO.getEnterpriseId(),staffClerkRelationDTO.getStoreId());
+					continue;
+				}
 				ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
 				if(clerk != null){
 					StoreDTO store = storeService.getStore(clerk.getStoreId());