Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+2
-1
@@ -388,7 +388,8 @@ public class WeixinController {
|
||||
return postImageMessage.format();
|
||||
}else{
|
||||
PostTextMessage postMessage = new PostTextMessage(
|
||||
"亲爱的用户,感谢关注房价网官方微信"+"\n" +"1.发送“PDS”,申请试用PDS不动产大数据服务平台;"+"\n" +"2.发送小区名称,即可获得小区均价及详情;"+"\n"+"3.发送城市名称,即可获得城市二手房均价;"+"\n"+"4.发送“调查”,即可参与小区调查;"+"\n"+"更多内容请登陆www.fangjia.com");
|
||||
"欢迎关注房价网!"+"\n" +"想了解我们的产品服务及更多企业级地址数据解决方案,可登录官网http://sh.fangjia.com/\n" +
|
||||
"一对一在线人工咨询,可添加企业客服微信13816692251"+"\n"+"全国客服热线:400-188-3737"+"\n\n"+"市场品牌或渠道合作,发邮件至gujia@fangjia.com");
|
||||
postMessage.setToUserName(receivedMessage.getFromUserName());
|
||||
return postMessage.format();
|
||||
}
|
||||
|
||||
+4
@@ -141,6 +141,7 @@ public class DistrictController {
|
||||
}
|
||||
|
||||
public Object districtDetailAction(DistrictModel districtModel,HttpServletRequest request,HttpServletResponse response) {
|
||||
System.out.println("小区详情coming");
|
||||
//id和name不能同时为空
|
||||
if(StringUtils.isBlank(districtModel.getId()) && (StringUtils.isBlank(districtModel.getCityName()) || StringUtils.isBlank(districtModel.getName()))) {
|
||||
districtModel.setMsg("参数错误");
|
||||
@@ -149,13 +150,16 @@ public class DistrictController {
|
||||
|
||||
District district = null;
|
||||
if(StringUtils.isNotBlank(districtModel.getId())) {
|
||||
System.out.println("小区详情1");
|
||||
district = districtService.findById(districtModel.getId());
|
||||
|
||||
if(district != null) {
|
||||
districtModel.setCityName(district.getCity());
|
||||
districtModel.setRegion(district.getRegion());
|
||||
districtModel.setName(district.getName());
|
||||
}
|
||||
} else {
|
||||
System.out.println("小区详情2");
|
||||
district = districtService.findByKeyMiniModel(districtModel.getCityName(), districtModel.getRegion(), districtModel.getName(), "district");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user