Merge branch 'open_bohai' into 'master'

渤海地址改为自己输入

See merge request !471
This commit is contained in:
2022-11-30 14:28:46 +08:00
4 changed files with 24 additions and 18 deletions
@@ -454,9 +454,7 @@ public class WeiXinEvaluationController {
evaluation.setCity(district.getCity());
evaluation.setRegion(district.getRegion());
evaluation.setDistrictName(district.getName());
if(StringUtils.isBlank(evaluation.getAddress())){
evaluation.setAddress(district.getAddress());
}
evaluation.setAddress(district.getAddress());
evaluation.setUserId(userId);
evaluation.setDateCreated(new Date());
evaluation.setLastUpdated(new Date());
@@ -491,8 +489,8 @@ public class WeiXinEvaluationController {
if(fjtUser!=null && fjtUser.getRole()==17) {
System.out.println("渤海地址搜索 "+evaluation.getAddress());
List<JSONObject> bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getAddress());
System.out.println("渤海地址搜索 "+evaluation.getCertificateAddress());
List<JSONObject> bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getCertificateAddress());
JSONObject o = null;
if(bhDists.size()==0){
bhDists = BHBankUtils.getDistrictByBhbank(district.getName());
@@ -545,7 +543,7 @@ public class WeiXinEvaluationController {
if(StringUtils.isBlank(usersDetail.getMobile())){
usersDetail.setMobile(fjtUser.getEmail());
}
System.out.println("渤海询价搜索 "+evaluation.getAddress());
System.out.println("渤海询价搜索 "+evaluation.getCertificateAddress());
JSONObject bhApiResult = BHBankUtils.getInquirePrice(model, bhMatchMap, usersDetail, evaluation.getTotalPrice());
if(bhApiResult!=null && (Integer)bhApiResult.get("errCode")==0){
System.out.println("渤海询价搜索结果 "+bhApiResult.toString());
@@ -1411,11 +1409,16 @@ public class WeiXinEvaluationController {
}
if(uploadfiles.size()>0){
JSONObject jsonObj = BHBankUtils.inquireUploadFiles2(usersDetail.getName(),model.getQueryId(), model.getFileClass(), uploadfiles);
if(jsonObj!=null && (Integer)jsonObj.get("errCode")!=0) {
mav.setModel(BasicModel.buildServerErrorModel().setMsg((String) jsonObj.get("errMsg")));
if(jsonObj!=null){
if(jsonObj!=null && (Integer)jsonObj.get("errCode")!=0) {
mav.setModel(BasicModel.buildServerErrorModel().setMsg((String) jsonObj.get("errMsg")));
}else{
mav.setModel(BasicModel.buildServerErrorModel().setMsg(("文件上传成功!")));
}
}else{
mav.setModel(BasicModel.buildServerErrorModel().setMsg(("文件上传成功!")));
mav.setModel(BasicModel.buildServerErrorModel().setMsg("上传失败!"));
}
}
} catch (Exception e) {
e.printStackTrace();
@@ -1,9 +1,7 @@
// JavaScript Document
/* 选择操作 */
// 选择操作-地址
$(document).on('click', '.create-actions00', function () {
/*$(document).on('click', '.create-actions00', function () {
var buttons1 = [
{
text: '请选择地址',
@@ -31,6 +29,7 @@ $(document).on('click', '.create-actions00', function () {
var groups = [buttons1, buttons2];
$.actions(groups);
});
*/
// 选择操作-房型-室
$(document).on('click', '.create-actions01', function () {
@@ -47,13 +47,17 @@
<li>
<div class="item-content">
<div class="item-inner">
<div class="content-block">
<div class="item-title label di">地址:</div>
<input name="fjtEvaluation.address" type="hidden" id="address" placeholder="请选择地址" required>
<p class="di"><a href="#" class="create-actions00">请选择地址</a></p>
<div class="item-title label">产证地址:</div>
<div class="item-input">
<input type="text" placeholder="请输入产证地址" id="certificateAddress"
name="fjtEvaluation.certificateAddress" required>
</div>
<#-- <div class="content-block">-->
<#-- <div class="item-title label di">地址:</div>-->
<#-- <input name="fjtEvaluation.address" type="hidden" id="address" placeholder="请选择地址" required>-->
<#-- <p class="di"><a href="#" class="create-actions00">请选择地址</a></p>-->
<#-- </div>-->
</div>
<div class="item-media"><span>(必填项)</span></div>
</div>
@@ -34,7 +34,7 @@
<div class="topic">
<div class="topicContent topicTop" style="padding:0px 20px;">
<p>${fjtEvaluation.districtName!}</p>
<p style="margin-top:-4px;"><i class="location"></i><small>${fjtEvaluation.address!} <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("号")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}号</#if>${fjtEvaluation.roomNum!}室</small> <a href="../district/weXinList?cityName=${fjtEvaluation.city!}" class="collectionLink" style="line-height: 32px;">重新评估&nbsp;></a></p>
<p style="margin-top:-4px;"><i class="location"></i><small><#if fjtEvaluation.certificateAddress??>${fjtEvaluation.certificateAddress!}<#else>${fjtEvaluation.address!}</#if> <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("号")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}号</#if>${fjtEvaluation.roomNum!}室</small> <a href="../district/weXinList?cityName=${fjtEvaluation.city!}" class="collectionLink" style="line-height: 32px;">重新评估&nbsp;></a></p>
<p style="color: #F4A460;font-size: 12px;line-height: 20px;margin-top: -5px;margin-left: 20px;">*请确认与产证地址一致</p>
<span></span>
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0 && bohaiEvaluationAudit.inquirePrice gt 0>