移动端客户洽谈需求

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;
+
 }

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}
     </select>

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<AppCrmVehicleDemandParticularsVo> intendedModel(String sid) {
-        AppCrmVehicleDemandParticularsVo vo = crmVehicledemandService.intendedModel(sid);
+       return crmVehicledemandService.intendedModel(sid);
-        return new ResultBean<AppCrmVehicleDemandParticularsVo>().success().setData(vo);
     }
 
     @Override

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<CrmVehicledemand
     public ResultBean<AppCrmVehicledemandDetailsVo> initVisitDemands(String intentionSid) {
         ResultBean<AppCrmVehicledemandDetailsVo> rb = ResultBean.fireFail();
         AppCrmVehicledemandDetailsVo appCrmVehicledemandDetailsVo = baseMapper.selectBySid(intentionSid);
-        ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails3(intentionSid);
+        if(!"1".equals(appCrmVehicledemandDetailsVo.getFinancePlan())){
-        if (resultBean.getData() != null) {
+            ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails3(intentionSid);
-            AppCrmSolutions finNormal = new AppCrmSolutions();
+            if (resultBean.getData() != null) {
-            BeanUtil.copyProperties(resultBean.getData(), finNormal);
+                AppCrmSolutions finNormal = new AppCrmSolutions();
-            List<SolutionListVo> financeForms = resultBean.getData().getFinanceForms();
+                BeanUtil.copyProperties(resultBean.getData(), finNormal);
-            if (!financeForms.isEmpty()) {
+                List<SolutionListVo> financeForms = resultBean.getData().getFinanceForms();
-                List<CrmSolutionListVo> voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList());
+                if (!financeForms.isEmpty()) {
-                finNormal.setFinanceForms(voList);
+                    List<CrmSolutionListVo> 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<CrmVehicledemand
      * @param sid
      * @return
      */
-    public AppCrmVehicleDemandParticularsVo intendedModel(String sid) {
+    public ResultBean<AppCrmVehicleDemandParticularsVo> intendedModel(String sid) {
+        ResultBean<AppCrmVehicleDemandParticularsVo> rb = ResultBean.fireFail();
         AppCrmVehicleDemandParticularsVo appCrmVehicleDemandParticularsVo = baseMapper.intendedModel(sid);
-        return appCrmVehicleDemandParticularsVo;
+        if(!"1".equals(appCrmVehicleDemandParticularsVo.getFinancePlan())){
+            ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails3(sid);
+            if (resultBean.getData() != null) {
+                AppCrmSolutions finNormal = new AppCrmSolutions();
+                BeanUtil.copyProperties(resultBean.getData(), finNormal);
+                List<SolutionListVo> financeForms = resultBean.getData().getFinanceForms();
+                if (!financeForms.isEmpty()) {
+                    List<CrmSolutionListVo> 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);
     }
 
     /**