From aa035c301b905180590824b237a962c343ae1453 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 31 Aug 2022 23:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVehicleActualSalesService.java        |  2 +-
 .../commoncontract/CommonContractService.java |  1 +
 .../BusSalesOrderInsurance.java               |  4 ++-
 .../BusSalesOrderInsuranceDetailsVo.java      |  4 ++-
 .../BusSalesOrderInsuranceDto.java            |  4 ++-
 .../BusSalesOrderInsuranceQuery.java          |  2 +-
 .../BusSalesOrderInsuranceVo.java             |  3 ++-
 .../app/AppBusSalesOrderInsuranceDto.java     |  2 ++
 .../app/AppBusSalesOrderInsuranceVo.java      |  2 ++
 .../bussalesorder/BusSalesOrderService.java   | 26 ++++++++++++++-----
 .../BusSalesOrderInsuranceMapper.xml          |  3 ++-
 .../BusSalesOrderInsuranceService.java        |  3 +++
 .../CrmVehicledemandFeign.java                |  1 +
 .../insurance/InsuranceInfoDto.java           |  3 +++
 .../saleOrders/insurance/InsuranceInfoVo.java |  2 ++
 15 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
index 3863de2b72..78411e5cb8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
@@ -623,7 +623,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 map.put("modelSid", modelSid);
                 map.put("configSid", configSid);
                 map.put("selectType", 0);
-                appVehicleVersionVo.setJson(JSONObject.toJSONString(map));
+                appSubVersionVo.setJson(JSONObject.toJSONString(map));
                 BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
                 vos.setCarDetailPage(appVehicleVersionVo);});}
         vo.setRecords(records);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index d8d79136e2..bb885c0591 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1387,6 +1387,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 //签订日期、签订地点
                 //订金、合同金额
                 commonContract.setDeposit(new BigDecimal(depositTotal));
+                commonContract.setContractAmount(depositTotal);
                 //合同附件
                 //身份证信息附件
                 //车型sid
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsurance.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsurance.java
index ff6d9d3808..9f1e6bd5de 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsurance.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsurance.java
@@ -59,6 +59,8 @@ public class BusSalesOrderInsurance extends BaseEntity {
     @ApiModelProperty("单台车保费预估金额")
     private BigDecimal insuranceCarMoney;
     @ApiModelProperty("公司入保期数")
-    private Integer insuranceNum;
+    private String insuranceNum;
+
+    private String insuranceNumKey;
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java
index 411e5c43cd..83809d3fad 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java
@@ -57,9 +57,11 @@ public class BusSalesOrderInsuranceDetailsVo implements Vo {
     @JsonSerialize(using = ToStringSerializer.class)
     private String insuranceCarMoney;
     @ApiModelProperty("公司入保期数")
-    private Integer insuranceNum;
+    private String insuranceNum;
 
     @ApiModelProperty(value = "保险备注")
     private String remarks;
 
+    private String insuranceNumKey;
+
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java
index 51acbc7230..32164d202b 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java
@@ -54,9 +54,11 @@ public class BusSalesOrderInsuranceDto implements Dto {
     @ApiModelProperty("单台车保费预估金额")
     private String insuranceCarMoney;
     @ApiModelProperty("公司入保期数")
-    private Integer insuranceNum;
+    private String insuranceNum;
 
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    private String insuranceNumKey;
+
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceQuery.java
index b553eb74de..d6b8fa6b4b 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceQuery.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceQuery.java
@@ -58,6 +58,6 @@ public class BusSalesOrderInsuranceQuery implements Query {
 	@ApiModelProperty("单台车保费预估金额")
     private BigDecimal insuranceCarMoney;
 	@ApiModelProperty("公司入保期数")
-    private Integer insuranceNum;
+    private String insuranceNum;
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceVo.java
index 6bd10516ec..2a30d74da3 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceVo.java
@@ -61,6 +61,7 @@ public class BusSalesOrderInsuranceVo implements Vo {
     @JsonSerialize(using = ToStringSerializer.class)
     private String insuranceCarMoney;
     @ApiModelProperty("公司入保期数")
-    private Integer insuranceNum;
+    private String insuranceNum;
 
+    private String insuranceNumKey;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java
index 35a2e11d1b..bb6f80408b 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java
@@ -27,4 +27,6 @@ public class AppBusSalesOrderInsuranceDto implements Dto {
     @ApiModelProperty(value = "销售订单sid")
     private String salesOrderSid;
 
+    private String insuranceNumKey;
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java
index 68c72b2c38..f23c51ac34 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java
@@ -27,4 +27,6 @@ public class AppBusSalesOrderInsuranceVo implements Vo {
     private String number;
     @ApiModelProperty(value = "备注")
     private String remarks;
+
+    private String numberKey;
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 7c71505fdc..a4d2b2fb0a 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -1265,15 +1265,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
      */
     public AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid) {
         AppBusSalesOrderBillInfoVo vo = baseMapper.getBillInfo(saleOrderSid);
-        String affiliatedOrgSid = vo.getAffiliatedOrgSid();
-        if (StringUtils.isNotBlank(affiliatedOrgSid)) {
+        if(vo != null){
+            String affiliatedOrgSid = vo.getAffiliatedOrgSid();
+            if (StringUtils.isNotBlank(affiliatedOrgSid)) {
+                vo.setAffiliatedType("1");
+                vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
+            } else {
+                vo.setAffiliatedType("0");
+                vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
+            }
+            vo.setSaleOrderSid(saleOrderSid);
+        }else{
+            vo = new AppBusSalesOrderBillInfoVo();
+            //根据意向车型查询信息
+            vo.setIntentionSid(saleOrderSid);
             vo.setAffiliatedType("1");
-            vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
-        } else {
-            vo.setAffiliatedType("0");
-            vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
         }
-        vo.setSaleOrderSid(saleOrderSid);
+
         return vo;
     }
 
@@ -2163,6 +2171,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 String x2 = "入保期数";
                 vo.setInsuranceInfo(busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum() + "期");
             }
+        }else{
+            if ("0".equals(busSalesOrder.getIsInsurance())) {
+                vo.setInsuranceInfo("未在公司入保");
+            }
         }
         /***************************车型信息***************************************/
         AppOrderModelInfoVo modelInfo = busSalesOrderModelService.selectModel(sid);
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
index c41cc2f1dc..fbb2f3b6cb 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
@@ -49,7 +49,8 @@
                insuranceName     as name,
                insuranceCarMoney as price,
                insuranceNum      as number,
-               remarks
+               remarks,
+               insuranceNumKey   as numberKey
         from bus_sales_order_insurance
         where salesOrderSid = #{sid}
     </select>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
index 480b6e2081..b13dd0284c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
@@ -112,6 +112,9 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
             }
 
         } else if ("0".equals(dto.getIsInsureType())) {
+            if(StringUtils.isBlank(dto.getRemarks())){
+                return rb.setMsg("备注不能为空");
+            }
             //查询保险信息是否有数据
             BusSalesOrderInsurance busSalesOrderInsurance = baseMapper.selectByOrderSid(dto.getSalesOrderSid());
             if (busSalesOrderInsurance != null) {
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java
index d4ff388a35..5536d35240 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java
@@ -154,4 +154,5 @@ public interface CrmVehicledemandFeign {
     @GetMapping("/getInfo/{intentionSid}")
     ResultBean<CrmVehicleDemandOrderVo> getInfo(@PathVariable("intentionSid") String intentionSid);
 
+
 }
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java
index b6ff744b54..e42a07f765 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java
@@ -31,5 +31,8 @@ public class InsuranceInfoDto implements Dto {
     @JsonProperty(value = "saleOrderSid")
     private String salesOrderSid;
 
+    @JsonProperty("numberKey")
+    private String insuranceNumKey;
+
 
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java
index 381eb29f4b..8aaf6697a9 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java
@@ -33,4 +33,6 @@ public class InsuranceInfoVo implements Vo {
 
     @ApiModelProperty(value = "备注")
     private String remarks;
+
+    private String numberKey;
 }