From 289ad4595d3f029a0f4d2ae9e6fd112d03b043bc Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 30 Aug 2023 14:46:00 +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     |   2 +
 .../CrmVehicledemandMapper.xml                |   3 +-
 .../CrmVehicledemandService.java              | 104 +++++++++++++-----
 .../loansolutions/LoanSolutionsService.java   |   8 +-
 4 files changed, 83 insertions(+), 34 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 374befa7c0..2991bcef37 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
@@ -9,6 +9,7 @@ import lombok.Data;
 public class AppCrmVehicleDemandParticularsVo implements Vo {
     @ApiModelProperty("购车方式value")
     private String type;
+    private String purchaseMethodKey;
 
     @ApiModelProperty("车型sid")
     private String modelSid;
@@ -46,6 +47,7 @@ public class AppCrmVehicleDemandParticularsVo implements Vo {
     private AppCrmSolutions finNormal;
 
     @ApiModelProperty(value = "金融方案key")
+    @JsonProperty("financePlanKey")
     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 b350db540b..7a06176c6f 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
@@ -129,7 +129,8 @@
                cv.estimatedPickupDate                                 AS `date`,
         cv.financePlan,
         cv.financePlanValue,
-        cv.typeKey
+        cv.typeKey,
+        cv.purchaseMethod purchaseMethodKey
         FROM crm_vehicledemand cv
         WHERE cv.sid = #{sid}
     </select>
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 02a162d257..783dc3cae1 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,7 +362,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
     public ResultBean<AppCrmVehicledemandDetailsVo> initVisitDemands(String intentionSid) {
         ResultBean<AppCrmVehicledemandDetailsVo> rb = ResultBean.fireFail();
         AppCrmVehicledemandDetailsVo appCrmVehicledemandDetailsVo = baseMapper.selectBySid(intentionSid);
-        if(!"1".equals(appCrmVehicledemandDetailsVo.getFinancePlan())){
+        if (!"1".equals(appCrmVehicledemandDetailsVo.getFinancePlan())) {
             ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails3(intentionSid);
             if (resultBean.getData() != null) {
                 AppCrmSolutions finNormal = new AppCrmSolutions();
@@ -407,6 +407,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     SolutionssDto solutionsDto = new SolutionssDto();
                     BeanUtil.copyProperties(finNormal, solutionsDto, "sid");
                     solutionsDto.setSaleOrderSid(sid);
+                    solutionsDto.setShowMore(false);
                     ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
                     entity.setTypeKey("1");
                     entity.setType("资方常规");
@@ -420,6 +421,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                 SolutionssDto solutionsDto = new SolutionssDto();
                 BeanUtil.copyProperties(finNormal, solutionsDto, "sid");
                 solutionsDto.setSaleOrderSid(sid);
+                solutionsDto.setShowMore(true);
                 ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
                 entity.setTypeKey("1");
                 entity.setType("资方常规");
@@ -450,7 +452,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
     public ResultBean<AppCrmVehicleDemandParticularsVo> intendedModel(String sid) {
         ResultBean<AppCrmVehicleDemandParticularsVo> rb = ResultBean.fireFail();
         AppCrmVehicleDemandParticularsVo appCrmVehicleDemandParticularsVo = baseMapper.intendedModel(sid);
-        if(!"1".equals(appCrmVehicleDemandParticularsVo.getFinancePlan())){
+        if (!"1".equals(appCrmVehicleDemandParticularsVo.getFinancePlan())) {
             ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails3(sid);
             if (resultBean.getData() != null) {
                 AppCrmSolutions finNormal = new AppCrmSolutions();
@@ -600,25 +602,48 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
             BeanUtil.copyProperties(dto, crmVehicledemand, "sid");
             crmVehicledemand.setCustomerSid(crmCustomerTemp.getSid());
             crmVehicledemand.setStates("1");
-            //新增客户的金融方案
-            if ("1".equals(dto.getTypeKey())) {//资方常规
-                CrmSolutions crmSolutions = dto.getCrmSolutions();
-                if (crmSolutions != null) {
-                    SolutionssDto solutionsDto = new SolutionssDto();
-                    BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
-                    solutionsDto.setSaleOrderSid(sid);
-                    if ("2".equals(dto.getFinancePlan())) {
-                        solutionsDto.setShowMore(false);
-                    } else if ("3".equals(dto.getFinancePlan())) {
-                        solutionsDto.setShowMore(true);
-                    } else if ("4".equals(dto.getFinancePlan())) {
+            if ("1".equals(dto.getPurchaseMethod())) {
+                if ("2".equals(dto.getFinancePlan())) {//三方金融
+                    if ("1".equals(dto.getTypeKey())) {//资方常规
+                        CrmSolutions crmSolutions = dto.getCrmSolutions();
+                        if (crmSolutions != null) {
+                            SolutionssDto solutionsDto = new SolutionssDto();
+                            BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
+                            solutionsDto.setSaleOrderSid(sid);
+                            if ("2".equals(dto.getFinancePlan())) {
+                                solutionsDto.setShowMore(false);
+                            }
+                            ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                        }
+                        crmVehicledemand.setTypeKey("1");
+                        crmVehicledemand.setType("资方常规");
+                    }
+                }
+            } else {
+                //新增客户的金融方案
+                if ("1".equals(dto.getTypeKey())) {//资方常规
+                    CrmSolutions crmSolutions = dto.getCrmSolutions();
+                    if (crmSolutions != null) {
+                        SolutionssDto solutionsDto = new SolutionssDto();
+                        BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
+                        solutionsDto.setSaleOrderSid(sid);
                         solutionsDto.setShowMore(true);
+                        ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                    }
+                    crmVehicledemand.setTypeKey("1");
+                    crmVehicledemand.setType("资方常规");
+                } else {//定制金融
+                }
+                SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
+                if (loanSolutions != null) {
+                    if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
+                        crmVehicledemand.setFinancePlan("4");//担保
+                        crmVehicledemand.setFinancePlanValue("担保");//担保
+                    } else {
+                        crmVehicledemand.setFinancePlan("3");//自营非担保
+                        crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
                     }
-                    ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
                 }
-                crmVehicledemand.setTypeKey("1");
-                crmVehicledemand.setType("资方常规");
-            } else {//定制金融
             }
             baseMapper.insert(crmVehicledemand);
 
@@ -629,9 +654,27 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
             }
             BeanUtil.copyProperties(dto, crmVehicledemand, "sid");
             crmVehicledemand.setCustomerSid(crmCustomerTemp.getSid());
-            if ("1".equals(dto.getFinancePlan())) {
-                //删除金融方案
-                loanSolutionsFeign.deleteByOrderSid(sid);
+            if ("1".equals(dto.getPurchaseMethod())) {
+                if ("2".equals(dto.getFinancePlan())) {//三方金融
+                    if ("1".equals(dto.getTypeKey())) {//资方常规
+                        CrmSolutions crmSolutions = dto.getCrmSolutions();
+                        if (crmSolutions != null) {
+                            SolutionssDto solutionsDto = new SolutionssDto();
+                            BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
+                            solutionsDto.setSaleOrderSid(sid);
+                            if ("2".equals(dto.getFinancePlan())) {
+                                solutionsDto.setShowMore(false);
+                            }
+                            ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                        }
+                        crmVehicledemand.setTypeKey("1");
+                        crmVehicledemand.setType("资方常规");
+                    }
+                } else {
+                    crmVehicledemand.setType(null);
+                    crmVehicledemand.setTypeKey(null);
+                    loanSolutionsFeign.deleteByOrderSid(sid);
+                }
             } else {
                 //新增客户的金融方案
                 if ("1".equals(dto.getTypeKey())) {//资方常规
@@ -640,18 +683,25 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                         SolutionssDto solutionsDto = new SolutionssDto();
                         BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
                         solutionsDto.setSaleOrderSid(sid);
-                        if ("2".equals(dto.getFinancePlan())) {
-                            solutionsDto.setShowMore(false);
-                        } else if ("3".equals(dto.getFinancePlan()) || "4".equals(dto.getFinancePlan())) {
-                            solutionsDto.setShowMore(true);
-                        }
+                        solutionsDto.setShowMore(true);
                         ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                    }else{
+                        loanSolutionsFeign.deleteByOrderSid(sid);
                     }
                     crmVehicledemand.setTypeKey("1");
                     crmVehicledemand.setType("资方常规");
-
                 } else {//定制金融
                 }
+                SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
+                if (loanSolutions != null) {
+                    if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
+                        crmVehicledemand.setFinancePlan("4");//担保
+                        crmVehicledemand.setFinancePlanValue("担保");//担保
+                    } else {
+                        crmVehicledemand.setFinancePlan("3");//自营非担保
+                        crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
+                    }
+                }
             }
             baseMapper.updateById(crmVehicledemand);
         }
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 f1226205fa..ffc4484c20 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
@@ -2228,14 +2228,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 }
             }
         }else{
-            if ("2".equals(loanSolutions.getTypeKey())) {
+            if ("02".equals(loanSolutions.getTypeKey())) {
                 solutionssVo.setFactoryDiscountUse("抵车款");
                 if (isTrue) {
-                    if ("02".equals(loanSolutions.getTypeKey())) {
-                        solutionssVo.setShowMore(false);
-                    } else {
-                        solutionssVo.setShowMore(true);
-                    }
+                    solutionssVo.setShowMore(false);
                 } else {
                     solutionssVo.setShowMore(false);
                 }