From ce01f9d96ab15a6a8602b8f46227b4840c81e2c2 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 12 Sep 2023 12:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java | 2 ++ .../crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java | 1 + .../crm/biz/crmvehicledemand/CrmVehicledemandService.java | 2 ++ .../riskcenter/api/loansolutions/app/SolutionssQuery.java | 2 ++ .../anrui/riskcenter/api/loansolutions/app/SolutionssVo.java | 2 ++ .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 3 +++ 6 files changed, 12 insertions(+) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java index e262710da3..2c7e86ca0a 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java @@ -165,4 +165,6 @@ public class AppCrmSolutions { private String serviceChargeTypeKey; private String serviceChargeTypeValue; + + private String modelSid; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java index 08d86715c9..b3e0975666 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java @@ -54,4 +54,5 @@ public class AppCrmVehicledemandDetailsVo implements Vo { private AppCrmSolutions finNormal; + } 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 52948e51e5..c6ca137982 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 @@ -371,7 +371,9 @@ public class CrmVehicledemandService extends MybatisBaseService voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList()); finNormal.setFinanceForms(voList); } + finNormal.setModelSid(appCrmVehicledemandDetailsVo.getModelSid()); appCrmVehicledemandDetailsVo.setFinNormal(finNormal); + } } return rb.success().setData(appCrmVehicledemandDetailsVo); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java index 53c4df5310..0958d6b726 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java @@ -110,4 +110,6 @@ public class SolutionssQuery implements Query { private String offsetPurchasetax; @ApiModelProperty("名义留购价") private String nominalPrice; + + private String modelSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java index d6af1db096..ea1f0739f4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java @@ -170,5 +170,7 @@ public class SolutionssVo implements Vo { private String serviceChargeTypeKey; private String serviceChargeTypeValue; + private String modelSid; + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index a58d9b765a..0b5aa8906f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -7,6 +7,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdersVo; import com.yxt.anrui.buscenter.api.bussalesorder.OrderSolutionVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; @@ -1656,6 +1657,8 @@ public class LoanSolutionsService extends MybatisBaseService