Merge branch 'open_v2' into 'master'

Open v2

See merge request !811
This commit is contained in:
2024-02-20 13:44:33 +08:00
3 changed files with 16 additions and 12 deletions
@@ -542,7 +542,7 @@ public class UserController {
String code = usersInfoService.randomCode();
System.out.println(code);
try {
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",请立即验证。");
smsService.send(model.getMobile(), "【百盛评估】你的验证码是" + code + ",请立即验证。");
resultModel.setResult(Message.RESULT_SUCCESS);
CookieUtils.setCookie(mobile + "_" + type, code, "/", 60 * 60 * 24 *7, resp);
CacheUtils.putValue(CachePolicyEnum.TINY, FjtUsers.class, mobile, new Date().getTime());
@@ -1285,15 +1285,17 @@ public class WeiXinEvaluationController {
Point point = null;
if(district.getLng2()!=null){
point = new Point(district.getLng2()/10000000000.0, district.getLat2()/10000000000.0);
//boolean flag = InsidePolygon.aboutZone(point, points);
//boolean flag = InsidePolygon.isPtInPoly(point.getLon(), point.getLat(), points);
boolean flag = InsidePolygon2.checkIsInPolygon(point, points);
if(flag){
pbObj = pb;
System.out.println(district.getRegion()+" "+district.getName()+" "+pb.getName());
break;
}
}
//boolean flag = InsidePolygon.aboutZone(point, points);
//boolean flag = InsidePolygon.isPtInPoly(point.getLon(), point.getLat(), points);
boolean flag = InsidePolygon2.checkIsInPolygon(point, points);
if(flag){
pbObj = pb;
System.out.println(district.getRegion()+" "+district.getName()+" "+pb.getName());
break;
}
}
Integer yearAge = getBuildYear(district.getFinishBuildingDate());
if(pbObj!=null){
@@ -109,9 +109,11 @@
</div>
</div>
</div>
<div class="content-block">
<p><a href="../weiXinEvaluation/form?id=${id}" class="button button-big button-fill evaluation_btn external">房产评估</a></p>
</div>
<div class="content-block">
<p>
<a href="../weiXinEvaluation/form?id=${id}" class="button button-big button-fill evaluation_btn external">房产评估</a>
</p>
</div>
</#if>
</div>
</div>