gic 企业过期停用

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