From 364ef055982fe0201af54372b12071380c9b25fe Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 18 Nov 2022 11:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B0=8F=E6=95=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/core/util/DataUtil.java | 2 +- .../weixin/WeiXinEvaluationController.java | 62 +++++++++++++++---- .../open/model/weixin/EvaluationModel.java | 6 +- .../com/fangjia/open/util/BHBankUtils.java | 2 +- .../main/webapp/weiXinEvaluation/bhform.ftl | 19 +++--- .../main/webapp/weiXinEvaluation/bhreport.ftl | 8 +-- 6 files changed, 72 insertions(+), 27 deletions(-) diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index 608508eaa..24e130e93 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -1845,7 +1845,7 @@ public class DataUtil { // // System.out.println(FourUpSixInto("258.393", 2)); - String href = encodePicUrl("636b079c303c3f7093fd952a", "o", "upload"); + String href = encodePicUrl("63628191303c3f2682f4fbe6", "o", "upload"); String link = "http://static.fangjia.com/stc/fs/"+href; System.out.println(link); } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index ed8766b8c..e8cf6be57 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -232,13 +232,39 @@ public class WeiXinEvaluationController { jsonObject.put("rn", fjtEvaluation.getRoomNum()); jsonObject.put("wylx", StringUtils.isBlank(BUILDTYPE_MAP.get(fjtEvaluation.getBuildType())) ? "-" : BUILDTYPE_MAP.get(fjtEvaluation.getBuildType()));//物业类型 jsonObject.put("mj", fjtEvaluation.getHouseArea());//面积 - String zj = "-"; if(evaluationAudit != null && evaluationAudit.getInquirePrice() > 0){ - zj = String.valueOf((int)(evaluationAudit.getInquirePrice() / 10000)); + double zj = DataUtil.getDoubleRound(2, evaluationAudit.getInquirePrice() / 10000.0); + if(zj == (int)zj){ + jsonObject.put("zj", (int)zj);//总价 + }else{ + jsonObject.put("zj", zj);//总价 + } + }else{ + jsonObject.put("zj", "-");//总价 } - jsonObject.put("zj", zj);//总价 - jsonObject.put("ckj", (evaluationAudit == null || evaluationAudit.getHopePrice() == null) ? "-" : (int)(evaluationAudit.getHopePrice()/ 10000));//期望价 - jsonObject.put("zsj", (evaluationAudit == null || evaluationAudit.getLastPrice() == null) ? "-" : (int)(evaluationAudit.getLastPrice()/ 10000));//终审价 + + if(evaluationAudit == null || evaluationAudit.getHopePrice() == null){ + jsonObject.put("ckj","-"); + }else{ + double ckj = DataUtil.getDoubleRound(2,evaluationAudit.getHopePrice()/10000.0); + if(ckj == (int)ckj){ + jsonObject.put("ckj", (int)ckj);//期望价 + }else{ + jsonObject.put("ckj", ckj);//期望价 + } + } + + if(evaluationAudit == null || evaluationAudit.getLastPrice() == null){ + jsonObject.put("zsj","-"); + }else{ + double zsj = DataUtil.getDoubleRound(2,evaluationAudit.getLastPrice()/ 10000.0); + if(zsj == (int)zsj){ + jsonObject.put("zsj", (int)zsj);//终审价 + }else{ + jsonObject.put("zsj", zsj);//终审价 + } + } + jsonObject.put("zdr", StringUtils.isBlank(fjtEvaluation.getLender()) ? "-" : fjtEvaluation.getLender());//主贷人 if(evaluationAudit==null || (evaluationAudit!=null && StringUtils.isBlank(evaluationAudit.getInquireRemark()))){ jsonObject.put("pgsm","");//评估说明 @@ -258,7 +284,13 @@ public class WeiXinEvaluationController { if(totalPrice>0){ evaluationAudit.setAuditStatus(1); evaluationAudit.setInquirePrice(totalPrice); - jsonObject.put("zj", (int)(totalPrice/10000)); + + double zj = DataUtil.getDoubleRound(2, totalPrice / 10000.0); + if(zj == (int)zj){ + jsonObject.put("zj", (int)zj);//总价 + }else{ + jsonObject.put("zj", zj);//总价 + } bohaiEvaluationAuditService.updateBohaiEvaluationAudit(evaluationAudit); jsonObject.put("shzt", "价格已审核"); } @@ -288,7 +320,12 @@ public class WeiXinEvaluationController { evaluationAudit.setFeedbackMsg(callMsg.toString()); } - jsonObject.put("zsj",(int)(inquirePrice/ 10000));//终审价 + double zsj = DataUtil.getDoubleRound(2,inquirePrice/ 10000.0);//终审价 + if(zsj == (int)zsj){ + jsonObject.put("zsj", (int)zsj);//终审价 + }else{ + jsonObject.put("zsj", zsj);//终审价 + } bohaiEvaluationAuditService.updateBohaiEvaluationAudit(evaluationAudit); jsonObject.put("shzt", "审核完成"); } @@ -407,6 +444,9 @@ public class WeiXinEvaluationController { public Object businessUserEvaluateAction(EvaluationModel model, HttpServletRequest request){ + JsonModel json = new JsonModel(); + Map data = new HashMap(); + District district = districtService.findById(model.getDistrict().getId()); FjtEvaluation evaluation = model.getFjtEvaluation(); if(evaluation.getHouseArea() <=0 || evaluation.getHouseHight() <= 0 @@ -511,7 +551,7 @@ public class WeiXinEvaluationController { } System.out.println("渤海询价搜索 "+evaluation.getAddress()); JSONObject bhApiResult = BHBankUtils.getInquirePrice(model, bhMatchMap, usersDetail, evaluation.getTotalPrice()); - if(bhApiResult!=null){ + if(bhApiResult!=null && (Integer)bhApiResult.get("errCode")==0){ System.out.println("渤海询价搜索结果 "+bhApiResult.toString()); JSONObject dataObj = (JSONObject) bhApiResult.get("data"); String queryId = (String) dataObj.get("queryId"); @@ -540,16 +580,16 @@ public class WeiXinEvaluationController { audit.setDateCreated(new Date()); audit.setDateCreated(new Date()); bohaiEvaluationAuditService.saveBohaiEvaluationAudit(audit); + }else{ + data.put("msg", "评估失败!"); } }else{ fjtEvaluationService.saveEvaluation(evaluation); System.out.println("保存评估记录成功 "+evaluation.getDistrictName()); } - Map data = new HashMap(); data.put("id", String.valueOf(evaluation.getId())); data.put("role", String.valueOf(fjtUser.getRole())); - JsonModel json = new JsonModel(); json.setJsonModel(data); return json; } @@ -891,7 +931,7 @@ public class WeiXinEvaluationController { if(StringUtils.isNotBlank(model.getEvaluationId()) && model.getHopePrice()!=null){ BohaiEvaluationAudit evaluationAudit = bohaiEvaluationAuditService.findByBohaiEvaluationAuditId(Long.valueOf(model.getEvaluationId())); if(evaluationAudit != null){ - evaluationAudit.setHopePrice(model.getHopePrice()*10000); + evaluationAudit.setHopePrice((int)(model.getHopePrice()*10000)); evaluationAudit.setLastUpdated(new Date()); evaluationAudit.setAuditStatus(2); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java index 20f093053..cdf645a31 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java @@ -43,7 +43,7 @@ public class EvaluationModel extends BaseModel{ private Integer role; private String cardId; private Map loanInfoMap; - private Integer hopePrice; + private Double hopePrice; private String remark; private Integer loan; // private String preCode;//渤海接口--楼盘编码 @@ -222,11 +222,11 @@ public class EvaluationModel extends BaseModel{ this.bohaiEvaluationAudit = bohaiEvaluationAudit; } - public Integer getHopePrice() { + public Double getHopePrice() { return hopePrice; } - public void setHopePrice(Integer hopePrice) { + public void setHopePrice(Double hopePrice) { this.hopePrice = hopePrice; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java index 6a861a303..1168d8bd5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java @@ -210,7 +210,7 @@ public class BHBankUtils { return null; } - public static String inquireFeedback(String name, String queryId, Integer hopePrice){ + public static String inquireFeedback(String name, String queryId, Double hopePrice){ String feedbackId = null; List list = new ArrayList(); Map params = new HashMap(); diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl index 8a39228e1..68519a79b 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl @@ -252,16 +252,21 @@ async: false, method: "POST", success: function (data) { - if (data.id == undefined) { + if(data.msg){ $.toast("浼颁环澶辫触锛岃閲嶆柊璇勪及"); - $("#evaluateBtn").prop("disabled", false) - } else { - if(data.role == "17"){ - location.href = "bhreport?evaluationId=" + data.id - }else{ - location.href = "report?evaluationId=" + data.id + }else{ + if (data.id == undefined) { + $.toast("浼颁环澶辫触锛岃閲嶆柊璇勪及"); + $("#evaluateBtn").prop("disabled", false) + } else { + if(data.role == "17"){ + location.href = "bhreport?evaluationId=" + data.id + }else{ + location.href = "report?evaluationId=" + data.id + } } } + }, error: function(XMLHttpRequest){ $.toast("鏈嶅姟鍣ㄥ紓甯革紝璇烽噸鏂拌瘎浼�"); diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl index ecf07ff92..6c6e97d28 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl @@ -38,7 +38,7 @@

*璇风‘璁や笌浜ц瘉鍦板潃涓�鑷�

<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0 && bohaiEvaluationAudit.inquirePrice gt 0> -

璇勪及鎬讳环锛�<#if fjtEvaluation??><#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/10000)?int}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/10000)?int} 涓囧厓

+

璇勪及鎬讳环锛�<#if fjtEvaluation??><#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/10000)?string('0.##')}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/10000)?string('0.##')} 涓囧厓

璇勪及鍗曚环锛�<#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/fjtEvaluation.houseArea)?int}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/fjtEvaluation.houseArea)?int} 鍏�/骞崇背

<#if role?? && role==17 && loanInfoMap??>

鎵�灞炲垎绫伙細${loanInfoMap.type!}绫�

@@ -71,15 +71,15 @@ <#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.lastPrice??>
- 瀹℃牳浠凤細${(bohaiEvaluationAudit.lastPrice!/10000)?int} 涓囧厓
- 鏈熸湜浠凤細${(bohaiEvaluationAudit.hopePrice!/10000)?int} 涓囧厓 + 瀹℃牳浠凤細${(bohaiEvaluationAudit.lastPrice!/10000)?string('0.##')} 涓囧厓
+ 鏈熸湜浠凤細${(bohaiEvaluationAudit.hopePrice!/10000)?string('0.##')} 涓囧厓
<#else> <#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.hopePrice??>
- 鏈熸湜浠凤細${(bohaiEvaluationAudit.hopePrice!/10000)?int} 涓囧厓 + 鏈熸湜浠凤細${(bohaiEvaluationAudit.hopePrice!/10000)?string('0.##')} 涓囧厓 鍒锋柊