Merge branch 'open_gj' into 'master'

面积去除地下面积部分

See merge request !213
This commit is contained in:
2021-12-09 17:04:32 +08:00
2 changed files with 15 additions and 2 deletions
@@ -454,8 +454,10 @@ public class WeiXinEvaluationController {
System.out.println("渤海地址搜索 "+evaluation.getAddress());
List<JSONObject> bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getAddress());
JSONObject o = null;
if(bhDists.size()<1 && bhDists.size()>0){
if(bhDists.size()==0){
bhDists = BHBankUtils.getDistrictByBhbank(district.getName());
}
if(bhDists.size()==1){
o = bhDists.get(0);
}else if(bhDists.size()>1){
int mod = Integer.MAX_VALUE;
@@ -120,8 +120,19 @@ public class BHBankUtils {
params.put("houseNo",ev.getRoomNum());
}
if(ev.getHouseArea()>0){
params.put("groundArea", String.valueOf(ev.getHouseArea()));
if(ev.getBasementArea()!=null && ev.getBasementArea()>0){
double area = ev.getHouseArea() - ev.getBasementArea();
if(area>0){
params.put("groundArea", String.valueOf(area));
}
}else{
params.put("groundArea", String.valueOf(ev.getHouseArea()));
}
}
if(ev.getBasementArea()!=null && ev.getBasementArea()>0){
params.put("undergroundArea", String.valueOf(ev.getBasementArea()));
}
params.put("orientName", "南");
params.put("buildYear", ev.getFinishDateStr());
fjwTotalPrice= (int)(fjwTotalPrice/10000) * 10000;