diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java index 47168d20ee..09c8dad4d9 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.crm.api.crmvehicledemand; +import com.baomidou.mybatisplus.annotation.TableField; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -34,8 +35,10 @@ public class AppCrmVehicleDemandUpdateDto implements Dto { @ApiModelProperty("意向车型sid") private String intentionSid; - @ApiModelProperty(value = "金融方案key") + @ApiModelProperty(value = "1自有资金,2三方金融") private String financePlan; - @ApiModelProperty(value = "金融方案value") + @ApiModelProperty(value = "1自有资金,2三方金融") private String financePlanValue; + @ApiModelProperty("金融方案") + private CrmSolutions finNormal; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java index c925844f9e..41979a7bf4 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java @@ -1,5 +1,7 @@ package com.yxt.anrui.crm.api.crmvehicledemand; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; @@ -59,6 +61,7 @@ public class CrmVehicledemand extends BaseEntity { private String changeOptions; @ApiModelProperty("车型报价") + @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal vehicleModelOffer; @ApiModelProperty("数量") @@ -79,11 +82,11 @@ public class CrmVehicledemand extends BaseEntity { @ApiModelProperty("常用配置sid") private String comonConfigSid; - @ApiModelProperty(value = "金融方案key") + @ApiModelProperty("1自有资金,2三方金融,3非担保,4担保") private String financePlan; - @ApiModelProperty(value = "金融方案value") + @ApiModelProperty("1自有资金,2三方金融,3非担保,4担保") private String financePlanValue; - + @ApiModelProperty("01资方常规,02定制金融") private String typeKey; private String type; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java index 6815b73605..6790979f05 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java @@ -23,9 +23,8 @@ public class CrmVehicledemandsDto implements Dto { private String purchaseMethod; @ApiModelProperty("购车方式Value") private String purchaseMethodValue; - @ApiModelProperty("资金来源、担保类型") + @ApiModelProperty("01资方常规,02定制金融") private String type; - @ApiModelProperty("资金来源、担保类型key") private String typeKey; @ApiModelProperty("品牌名称") private String brandName; @@ -56,9 +55,9 @@ public class CrmVehicledemandsDto implements Dto { private String remarks; private CrmSolutions crmSolutions; - @ApiModelProperty("金融方案key") + @ApiModelProperty("1自有资金,2三方金融,3非担保,4担保") private String financePlan; - @ApiModelProperty("金融方案value") + @ApiModelProperty("资金来源、担保类型") private String financePlanValue; } 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 733c291507..abe59e16d1 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 @@ -364,24 +364,28 @@ public class CrmVehicledemandService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailByApplySid(sid); if (solutionsDetailsVoResultBean.getData() != null) { CrmSolutions loanTemplateSolutionsVo = new CrmSolutions(); BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), loanTemplateSolutionsVo); - if ("2".equals(crmVehicledemandsVo.getTypeKey())) { + if ("2".equals(crmVehicledemandsVo.getFinancePlan())) { loanTemplateSolutionsVo.setShowMore(false); - } else if ("3".equals(crmVehicledemandsVo.getTypeKey()) || "4".equals(crmVehicledemandsVo.getTypeKey())) { + } else if ("3".equals(crmVehicledemandsVo.getFinancePlan()) || "4".equals(crmVehicledemandsVo.getFinancePlan())) { loanTemplateSolutionsVo.setShowMore(true); } crmVehicledemandsVo.setCrmSolutions(loanTemplateSolutionsVo);