Merge branch 'open_gj' into 'master'

测试接口

See merge request !186
This commit is contained in:
2021-11-15 20:06:17 +08:00
2 changed files with 29 additions and 4 deletions
@@ -224,6 +224,7 @@ public class WeiXinEvaluationController {
Pager pager = new Pager(10);
pager.setCurrentPage(NumberUtils.toInt(page));
List<FjtEvaluation> fjtEvaluationList = fjtEvaluationService.findEvaluationsByUserId(userId, pager);
System.out.println("估价记录:"+fjtEvaluationList.size());
JSONArray ja = new JSONArray();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
for (int i = 0; i < fjtEvaluationList.size(); ++i) {
@@ -256,7 +257,9 @@ public class WeiXinEvaluationController {
jsonObject.put("shzt", "价格待审核");
//接入询价结果查询接口
System.out.println("开始接入询价结果查询接口......");
JSONObject obj = BHBankUtils.getInquireRecord(evaluationAudit.getQueryId());
System.out.println("接入询价结果查询接口完成......"+evaluationAudit.getQueryId());
if(obj!=null){
Integer totalPrice = (Integer) obj.get("inquirePrice");
if(totalPrice>0){
@@ -273,7 +276,9 @@ public class WeiXinEvaluationController {
jsonObject.put("shzt", "价格待审核");
if(evaluationAudit.getHopePrice()>0){
//接入反馈结果查询接口
System.out.println("开始接入反馈结果查询接口......");
JSONObject object = BHBankUtils.inquireFeedbackCall(evaluationAudit.getFeedbackId());
System.out.println("完成接入反馈结果查询接口......"+evaluationAudit.getFeedbackId());
if(object!=null){
Integer feedbackStatus = (Integer) object.get("feedbackStatus");
if(feedbackStatus!=0){
@@ -115,20 +115,40 @@
}
}
if (this.zj == "-") {
html += "</span></p><p><label>期望价:</label><span>" + this.qwj;
if(this.qwj!=undefined) {
html += "</span></p><p><label>期望价:</label><span>" + this.qwj
}else{
html += "</span></p><p><label>期望价:</label><span>-"
}
} else {
html += "&nbsp;万元</span></p><p><label>期望价:</label><span>" + this.qwj;
if(this.qwj!=undefined){
html += "&nbsp;万元</span></p><p><label>期望价:</label><span>" + this.qwj;
}else{
html += "</span></p><p><label>期望价:</label><span>-";
}
}
if (this.qwj == "-") {
html += "</span></p><p><label>终审价:</label><span>";
} else {
html += "&nbsp;万元</span></p><p><label>终审价:</label><span>";
if(this.qwj!=undefined){
html += "&nbsp;万元</span></p><p><label>终审价:</label><span>";
}else{
html += "</span></p><p><label>终审价:</label><span>";
}
}
if (this.zsj == "-") {
html += ("-</span></p></div></div></div>");
} else {
html += ("<em>" + this.zsj + "</em>&nbsp;万元</span></p></div></div></div>");
if(this.zsj!=undefined){
html += ("<em>" + this.zsj + "</em>&nbsp;万元</span></p></div></div></div>");
}else{
html += ("<em></em></span></p></div></div></div>");
}
}
} else {
html += "<div class='topic topic01'><div class='topicContent topicContent01'><div class='left'><p><label>下载日期:</label><span>" + this.xzrq +