fix

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

@@ -166,6 +166,10 @@ public class StoreController extends WebBaseController{
 			}else{
 				VO.setMainStoreFlag(0);
 			}
+			boolean flag = isEnterpriseOver(VO.getStoreId());
+			if(flag){
+				VO.setStoreStatus(2);
+			}
 		}
 		if(CollectionUtils.isNotEmpty(resultList)){
 			Map<Integer,StoreVO> map = com.gic.commons.util.CollectionUtil.toMap(resultList, "clerkType");
@@ -340,20 +344,19 @@ public class StoreController extends WebBaseController{
 	}
 	
 	//获取门店详情
-	@RequestMapping("/is-enterprise-over")
-	public HaobanResponse isEnterpriseOver(String storeId) {
+	public boolean isEnterpriseOver(String storeId) {
 		StoreDTO store = storeService.getStore(storeId);
 		if(store == null){
-			return resultResponse(HaoBanErrCode.ERR_1,true);
+			return true;
 		}
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(store.getEnterpriseId());
 		if(enterprise == null){
-			return resultResponse(HaoBanErrCode.ERR_1,true);
+			return true;
 		}
 		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
-			return resultResponse(HaoBanErrCode.ERR_1,false);
+			return false;
 		}
-		return resultResponse(HaoBanErrCode.ERR_1,true);
+		return true;
 		
 	}
 	

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreVO.java

@@ -25,6 +25,8 @@ public class StoreVO implements Serializable {
     private String wxEnterpriseRelatedId;
     private Date  createTime;
     private Integer mainStoreFlag;
+    
+    private Integer storeStatus ;
 
 	public Date getCreateTime() {
 		return createTime;
@@ -117,6 +119,12 @@ public class StoreVO implements Serializable {
 	public void setMainStoreFlag(Integer mainStoreFlag) {
 		this.mainStoreFlag = mainStoreFlag;
 	}
+	public Integer getStoreStatus() {
+		return storeStatus;
+	}
+	public void setStoreStatus(Integer storeStatus) {
+		this.storeStatus = storeStatus;
+	}
 
     
 }