fix

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

@@ -504,15 +504,12 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(enterpriseId);
-		if(enterprise == null || enterprise.getExpireTime() == null){
+		if(enterprise == null || enterprise.getExpireTime() == null || enterprise.getEnabledState() == null){
+            return resultResponse(HaoBanErrCode.ERR_1, false);
+        }
+		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis() && enterprise.getEnabledState() == 1){
 			return resultResponse(HaoBanErrCode.ERR_1,false);
 		}
-		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
-			return resultResponse(HaoBanErrCode.ERR_1,false);
-		}
-		if(enterprise.getEnabledState() == null || enterprise.getEnabledState() == 1){
-   			return resultResponse(HaoBanErrCode.ERR_1,false);
-   		}
 		return resultResponse(HaoBanErrCode.ERR_1,true);
 	}
 	

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

@@ -415,15 +415,12 @@ public class StoreController extends WebBaseController{
 			return true;
 		}
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(store.getEnterpriseId());
-		if(enterprise == null || enterprise.getExpireTime() == null){
+		if(enterprise == null || enterprise.getExpireTime() == null || enterprise.getEnabledState() == null){
 			return false;
-		}
-		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
+        }
+		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis() && enterprise.getEnabledState() == 1){
 			return false;
 		}
-		if(enterprise.getEnabledState() == null || enterprise.getEnabledState() == 1){
-   			return false;
-   		}
 		return true;
 	}