gic 企业过期停用

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);