From 2b07a5c6e0a10abd65773c6465862329abe1e30b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 29 Aug 2023 18:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=B4=BD=E8=B0=88=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCrmVehicleDemandParticularsVo.java | 11 ++++++ .../CrmVehicledemandMapper.xml | 5 ++- .../CrmVehicledemandRest.java | 3 +- .../CrmVehicledemandService.java | 39 +++++++++++++------ 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java index 23f51a52ad..374befa7c0 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.crm.api.crmvehicledemand; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,4 +40,14 @@ public class AppCrmVehicleDemandParticularsVo implements Vo { @ApiModelProperty("备注") private String remarks; + @JsonProperty("finTypeKey") + private String typeKey; + + private AppCrmSolutions finNormal; + + @ApiModelProperty(value = "金融方案key") + private String financePlan; + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; + } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 01f716970a..b350db540b 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -126,7 +126,10 @@ cv.comonConfigSid AS configSid, cv.number, cv.remarks, - cv.estimatedPickupDate AS `date` + cv.estimatedPickupDate AS `date`, + cv.financePlan, + cv.financePlanValue, + cv.typeKey FROM crm_vehicledemand cv WHERE cv.sid = #{sid} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java index 7d84e82f52..049287fbfc 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java @@ -187,8 +187,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { */ @Override public ResultBean intendedModel(String sid) { - AppCrmVehicleDemandParticularsVo vo = crmVehicledemandService.intendedModel(sid); - return new ResultBean().success().setData(vo); + return crmVehicledemandService.intendedModel(sid); } @Override diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index 718b3103df..02a162d257 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -362,16 +362,18 @@ public class CrmVehicledemandService extends MybatisBaseService initVisitDemands(String intentionSid) { ResultBean rb = ResultBean.fireFail(); AppCrmVehicledemandDetailsVo appCrmVehicledemandDetailsVo = baseMapper.selectBySid(intentionSid); - ResultBean resultBean = loanSolutionsFeign.selectDetails3(intentionSid); - if (resultBean.getData() != null) { - AppCrmSolutions finNormal = new AppCrmSolutions(); - BeanUtil.copyProperties(resultBean.getData(), finNormal); - List financeForms = resultBean.getData().getFinanceForms(); - if (!financeForms.isEmpty()) { - List voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList()); - finNormal.setFinanceForms(voList); + if(!"1".equals(appCrmVehicledemandDetailsVo.getFinancePlan())){ + ResultBean resultBean = loanSolutionsFeign.selectDetails3(intentionSid); + if (resultBean.getData() != null) { + AppCrmSolutions finNormal = new AppCrmSolutions(); + BeanUtil.copyProperties(resultBean.getData(), finNormal); + List financeForms = resultBean.getData().getFinanceForms(); + if (!financeForms.isEmpty()) { + List voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList()); + finNormal.setFinanceForms(voList); + } + appCrmVehicledemandDetailsVo.setFinNormal(finNormal); } - appCrmVehicledemandDetailsVo.setFinNormal(finNormal); } return rb.success().setData(appCrmVehicledemandDetailsVo); } @@ -445,9 +447,24 @@ public class CrmVehicledemandService extends MybatisBaseService intendedModel(String sid) { + ResultBean rb = ResultBean.fireFail(); AppCrmVehicleDemandParticularsVo appCrmVehicleDemandParticularsVo = baseMapper.intendedModel(sid); - return appCrmVehicleDemandParticularsVo; + if(!"1".equals(appCrmVehicleDemandParticularsVo.getFinancePlan())){ + ResultBean resultBean = loanSolutionsFeign.selectDetails3(sid); + if (resultBean.getData() != null) { + AppCrmSolutions finNormal = new AppCrmSolutions(); + BeanUtil.copyProperties(resultBean.getData(), finNormal); + List financeForms = resultBean.getData().getFinanceForms(); + if (!financeForms.isEmpty()) { + List voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList()); + finNormal.setFinanceForms(voList); + } + appCrmVehicleDemandParticularsVo.setFinNormal(finNormal); + } + } + + return rb.success().setData(appCrmVehicleDemandParticularsVo); } /**