diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java index 4cc728b6a..826c55070 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java @@ -80,7 +80,7 @@ public class DistrictController { // response.sendRedirect("/coming"); // return null; // } - if("b".equals(login_user_type)){ + if("b".equals(login_user_type) || "gb".equals(login_user_type)){ CacheUtils.putValue(CachePolicyEnum.LONG, UsersInfoService.class, weiXinId + "_city_"+ login_user_type , model.getCityName()); } Long userId = Long.parseLong(CookieUtils.getCookieValue(request,"login_user_id")); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 91651fb59..e97bc10ae 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -129,7 +129,7 @@ public class UserController { } System.out.println("reqCityChoicePage 微信OPEN_ID:" + weiXinId); //企业用户入口查询企业账户开通的城市 - if(type.equals("b") || type.equals("bh")){ + if(type.equals("b") || type.equals("gb")){ //Boolean isLogin = usersInfoService.checkEnterpriseWeiXinUserIsLogin(weiXinId); String cacheWeiXinId = CookieUtils.getCookieValue(request,"login_enterpriseuser_weixinid"); String loginUserIdstr = CookieUtils.getCookieValue(request,"login_user_id"); @@ -139,13 +139,13 @@ public class UserController { try { FjtUsers users = fjtUsersService.findById(userId); -// if(users.getRole()==17 && type.equals("b")){ -// CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); -// response.sendRedirect("reqLoginPage"); -// }else if(users.getRole()==12 && type.equals("bh")){ -// CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); -// response.sendRedirect("bhydLoginPage?code="+model.getCode()); -// }else{ + if(users.getRole()==17 && type.equals("gb")){ + CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); + response.sendRedirect("reqLoginPage"); + }else if(users.getRole()==12 && type.equals("b")){ + CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); + response.sendRedirect("bhydLoginPage?code="+model.getCode()); + }else{ List citys = userCityService.findSupportCityByUserId(userId); if(citys == null || citys.isEmpty()){ citys = Arrays.asList("上海"); @@ -156,7 +156,7 @@ public class UserController { // citys = userCityService.findSupportCityByUserId(userId); // } model.setCitys(citys); -// } + } } catch (Exception e) { model.setCitys(new ArrayList()); } @@ -209,6 +209,7 @@ public class UserController { CookieUtils.removeCookie(request, response,"login_enterpriseuser_weixinid"); response.sendRedirect("bhydLoginPage?code=bhydcode"); } catch (Exception e) { + e.printStackTrace(); } return model; } @@ -326,7 +327,7 @@ public class UserController { return resultModel; } CookieUtils.setCookie("login_user_id", user.getId() + "", "/", 60 * 60 * 24 *7, response); - CookieUtils.setCookie("login_user_type", "b", "/", 60 * 60 * 24 *7, response); + CookieUtils.setCookie("login_user_type", "gb", "/", 60 * 60 * 24 *7, response); CookieUtils.setCookie("login_enterpriseuser_weixinid", weiXinId, "/", 60 * 60 * 24 *7, response); //CacheUtils.putValue(CachePolicyEnum.LONG, UsersInfoService.class, weiXinId + "_" + Message.SMS_CODE_TYPE_ENTER_LOGIN , user.getId()); resultModel.setResult(Message.RESULT_SUCCESS); diff --git a/projects/fangjia-open/src/main/webapp/district/weXinList.ftl b/projects/fangjia-open/src/main/webapp/district/weXinList.ftl index 3e07b5ef4..46ef7c552 100644 --- a/projects/fangjia-open/src/main/webapp/district/weXinList.ftl +++ b/projects/fangjia-open/src/main/webapp/district/weXinList.ftl @@ -26,7 +26,7 @@
- + <#if !(cityName??) || cityName == ""> <#else> @@ -48,7 +48,7 @@
    - <#if type?? && type == 'b'> + <#if type?? && (type == 'b' || type == 'gb')>
    - <#if type?? && (type == 'b' || type == 'bh') && (citys??&&citys?size>0)> + <#if type?? && (type == 'b' || type == 'gb') && (citys??&&citys?size>0)>
    <#list citys as bo>

    ${bo}

    @@ -54,7 +54,7 @@
    - <#if type?? && type == 'c' || type == 'b' && (citys??&&citys?size=0)> + <#if type?? && type == 'c' || (type == 'b' || type == 'gb') && (citys??&&citys?size=0)>
    褰撳墠瀹氫綅鍩庡競
    diff --git a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl index 621633126..f9d2c03e3 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl @@ -84,7 +84,7 @@ if(re.result == "fail"){ $.toast(re.msg); } else { - window.location.href = "reqCityChoicePage?type=b"; + window.location.href = "reqCityChoicePage?type=gb"; } },error:function (data, status) { $.toast("鍙戦�佸け璐ワ紝璇烽噸璇�"); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index bea9e7589..543a2f6ce 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -2014,7 +2014,13 @@ public class DistrictServiceImpl implements DistrictService { params.add(new QueryParam("city", ClientUtils.escapeQueryChars(city))); } if (StringUtils.isNotBlank(region)) { - params.add(new QueryParam("region", ClientUtils.escapeQueryChars(RegionData.formatRegion(city, region)))); + city = ClientUtils.escapeQueryChars(city); + String newRegion = RegionData.formatRegion(city, region); + if(StringUtils.isNotBlank(newRegion)){ + params.add(new QueryParam("region", ClientUtils.escapeQueryChars(newRegion))); + }else{ + params.add(new QueryParam("region", region)); + } } if (StringUtils.isNotBlank(target)) { params.add(new QueryParam("category", target));