切换test 提交

src/main/java/com/ydtech/components/queue/ZmQuoteConsumer.java

@@ -107,9 +107,9 @@ public class ZmQuoteConsumer {
 
         QuoteKindRespVo kind;
         Map<String, Double> map = response.getKindList();
-        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
 
-        for (KindInfoVo kindInfoVo : kindList) {
+        for (KingInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(kindInfoVo.getKindCode());
             kind.setKindName(kindInfoVo.getKindName());

src/main/java/com/ydtech/modules/esm/model/vo/EsmInsPackageVo.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.esm.model.vo;
 
 
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,6 +27,6 @@ public class EsmInsPackageVo implements Serializable {
 
     @Valid
     @ApiModelProperty("险种信息")
-    private List<KindInfoVo> kindList;
+    private List<KingInfoVo> kindList;
 
 }

src/main/java/com/ydtech/modules/fee/service/impl/CostsCalServiceImpl.java

@@ -1,54 +1,21 @@
 package com.ydtech.modules.fee.service.impl;
 
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmRetailService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
-import com.ydtech.modules.fee.dto.FeeFactorInfoDto;
-import com.ydtech.modules.fee.dto.FeeSchemeReqDto;
-import com.ydtech.modules.fee.dto.FeeSchemeResDto;
 import com.ydtech.modules.fee.dto.vo.DeptManagerFee;
 import com.ydtech.modules.fee.dto.vo.EntranceFee;
 import com.ydtech.modules.fee.dto.vo.ExportFee;
 import com.ydtech.modules.fee.dto.vo.RetailStoreFee;
 import com.ydtech.modules.fee.service.CostsCalcService;
-import com.ydtech.modules.fee.service.FeeRuleSchemeService;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.ins.model.vo.QuoteRespVo;
-import com.ydtech.modules.order.entity.InsCopyFeeOrder;
-import com.ydtech.modules.order.entity.InsFeeOrder;
-import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.vo.*;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.modules.order.service.InsCopyFeeOrderService;
-import com.ydtech.modules.order.service.InsFeeOrderService;
-import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementProductCosts;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementUndwrtRules;
-import com.ydtech.modules.protocol.entity.po.PtlNewCarJudgeRules;
-import com.ydtech.modules.protocol.service.*;
-import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
-import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 费用接口中相关功能的实现类

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -1,26 +1,20 @@
 package com.ydtech.modules.fee.service.impl;
 
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.esm.model.EsmRetail;
-import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmRetailService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.fee.dto.FeeFactorInfoDto;
 import com.ydtech.modules.fee.dto.FeeSchemeReqDto;
 import com.ydtech.modules.fee.dto.FeeSchemeResDto;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
-import com.ydtech.modules.ins.model.vo.AccidentResponseVo;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsCopyFeeOrder;
 import com.ydtech.modules.order.entity.InsFeeOrder;
-import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsCopyFeeOrderService;
@@ -980,7 +974,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
     public FeeSchemeReqDto getFeeSchemeInfo(BaseQuoteInfoVo quoteInfoVo, QuoteRespVo quoteRespVo, String agreementId, String productId) {
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(agreementId);
         CarInfoVo carInfoVo = quoteInfoVo.getCarInfo();
-        List<KindInfoVo> kindList = quoteInfoVo.getKindList();
+        List<KingInfoVo> kindList = quoteInfoVo.getKingList();
         String thirdPartyInsurance = "";
         String driverAmount = "";
         String passengerAmount = "";
@@ -988,7 +982,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         String driverMedicalAmount = "";
         String passengerMedicalAmount = "";
         if (kindList != null && kindList.size() > 0) {
-            for (KindInfoVo kindInfoVo : kindList) {
+            for (KingInfoVo kindInfoVo : kindList) {
                 //三者保额
                 if ("B".equals(kindInfoVo.getKindCode())) {
                     thirdPartyInsurance = String.valueOf(kindInfoVo.getAmount());

src/main/java/com/ydtech/modules/ins/controller/InsALY_CBITAPIController.java

@@ -1,19 +1,13 @@
 package com.ydtech.modules.ins.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysCbitError;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.esm.model.EsmAgreement;
-import com.ydtech.modules.esm.model.EsmAgreementProd;
-import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
@@ -22,7 +16,6 @@ import com.ydtech.modules.ins.model.InsTaskHistory;
 import com.ydtech.modules.ins.model.cbit.*;
 import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.model.vo.CarModelQryVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.utils.CreateHtmlUtils;
 import com.ydtech.utils.HttpsPostUtil;
 import org.slf4j.Logger;
@@ -30,14 +23,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 

src/main/java/com/ydtech/modules/ins/controller/InsCBITAPIController.java

@@ -1,20 +1,14 @@
 package com.ydtech.modules.ins.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysCbitError;
 import com.ydtech.modules.admin.model.SysCbitLog;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.esm.model.EsmAgreement;
-import com.ydtech.modules.esm.model.EsmAgreementProd;
-import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
@@ -23,7 +17,7 @@ import com.ydtech.modules.ins.model.cbit.*;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CarModelQryVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.service.*;
 import com.ydtech.utils.HttpsPostUtil;
 import com.ydtech.utils.RSA.RSAUtils;
@@ -555,7 +549,7 @@ public class InsCBITAPIController extends BaseController {
             VehicleModel_QueRen vehicleModel_QueRen = JSON.parseObject(JSON.toJSONString(order.getCarinfo()), VehicleModel_QueRen.class);
             quoteInfo.setVehicleModel_QueRen(vehicleModel_QueRen);//险别加工时要用
             quoteInfo.setRiskList(JSON.parseArray(JSON.toJSONString(order.getRiskinfo()), CBITRiskInfoVo.class));
-            quoteInfo.setKindList(JSON.parseArray(JSON.toJSONString(order.getKindinfo()), KindInfoVo.class));
+            quoteInfo.setKindList(JSON.parseArray(JSON.toJSONString(order.getKindinfo()), KingInfoVo.class));
             httpResult = insCBITService.submitAudit(reqParam_in, quoteInfo);
 
            /* if (httpResult.getCode()==200) {
@@ -604,7 +598,7 @@ public class InsCBITAPIController extends BaseController {
             VehicleModel_QueRen vehicleModel_QueRen = JSON.parseObject(JSON.toJSONString(order.getCarinfo()), VehicleModel_QueRen.class);
             quoteInfo.setVehicleModel_QueRen(vehicleModel_QueRen);//险别加工时要用
             quoteInfo.setRiskList(JSON.parseArray(JSON.toJSONString(order.getRiskinfo()), CBITRiskInfoVo.class));
-            quoteInfo.setKindList(JSON.parseArray(JSON.toJSONString(order.getKindinfo()), KindInfoVo.class));
+            quoteInfo.setKindList(JSON.parseArray(JSON.toJSONString(order.getKindinfo()), KingInfoVo.class));
             httpResult = insCBITService.submitAudit(reqParam_in, quoteInfo);
 
            /* if (httpResult.getCode()==200) {
@@ -653,7 +647,7 @@ public class InsCBITAPIController extends BaseController {
             VehicleModel_QueRen vehicleModel_QueRen = JSON.parseObject(JSON.toJSONString(order.getCarinfo()), VehicleModel_QueRen.class);
             quoteInfo.setVehicleModel_QueRen(vehicleModel_QueRen);//险别加工时要用
             quoteInfo.setRiskList(JSON.parseArray(JSON.toJSONString(order.getRiskinfo()), CBITRiskInfoVo.class));
-            quoteInfo.setKindList(JSON.parseArray(JSON.toJSONString(order.getKindinfo()), KindInfoVo.class));
+            quoteInfo.setKindList(JSON.parseArray(JSON.toJSONString(order.getKindinfo()), KingInfoVo.class));
             httpResult = insCBITService.submitAudit(reqParam_in, quoteInfo);
 
            /* if (httpResult.getCode()==200) {

src/main/java/com/ydtech/modules/ins/controller/InsHengbangController.java

@@ -9,7 +9,6 @@ import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmAgreement;
 import com.ydtech.modules.esm.model.EsmAgreementProd;
-import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
@@ -205,7 +204,7 @@ public class InsHengbangController {
 //        ZG01005	交强+三者  交强+三者（三者的费用）
 //        ZG01006	交强+商业  交强+商业（交强的费用）
 //        ZG01007	交强+商业  交强+商业（商业的费用）
-        List<KindInfoVo> kinds = quoteInfo.getKindList();
+        List<KingInfoVo> kinds = quoteInfo.getKindList();
         String productId = "";
         String productname = "";
         List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +
@@ -668,8 +667,8 @@ public class InsHengbangController {
         hbQuoteInfo.setTaxonomyCode("02");
         hbQuoteInfo.setEpolicyFlag("N");
         List<HbKind> kindList = new ArrayList<HbKind>();
-        List<KindInfoVo> kinds = quoteInfo.getKindList();
-        for (KindInfoVo kind : kinds) {
+        List<KingInfoVo> kinds = quoteInfo.getKindList();
+        for (KingInfoVo kind : kinds) {
             HbKind hbKind = new HbKind();
             String kindcode = kind.getKindCode();
             if ("A".equals(kindcode)) {

src/main/java/com/ydtech/modules/ins/controller/InsHuanongController.java

@@ -3,14 +3,12 @@ package com.ydtech.modules.ins.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmAgreement;
 import com.ydtech.modules.esm.model.EsmAgreementProd;
-import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
@@ -209,7 +207,7 @@ public class InsHuanongController {
 //        ZG01005	交强+三者  交强+三者（三者的费用）
 //        ZG01006	交强+商业  交强+商业（交强的费用）
 //        ZG01007	交强+商业  交强+商业（商业的费用）
-        List<KindInfoVo> kinds = quoteInfo.getKindList();
+        List<KingInfoVo> kinds = quoteInfo.getKindList();
         String productId = "";
         String productname = "";
         List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +

src/main/java/com/ydtech/modules/ins/controller/InsRenbaoController.java

@@ -9,7 +9,6 @@ import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmAgreement;
 import com.ydtech.modules.esm.model.EsmAgreementProd;
-import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
@@ -151,7 +150,7 @@ public class InsRenbaoController {
 //        ZG01005	交强+三者  交强+三者（三者的费用）
 //        ZG01006	交强+商业  交强+商业（交强的费用）
 //        ZG01007	交强+商业  交强+商业（商业的费用）
-        List<KindInfoVo> kinds = quoteInfo.getKindList();
+        List<KingInfoVo> kinds = quoteInfo.getKindList();
         String productId = "";
         String productname = "";
         List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +
@@ -444,7 +443,7 @@ public class InsRenbaoController {
             }
         }
 
-        for (KindInfoVo kindInfoVo : quoteInfo.getKindList()) {
+        for (KingInfoVo kindInfoVo : quoteInfo.getKindList()) {
             RbKind rbKind = new RbKind();
             String kindcode = kindInfoVo.getKindCode();
             if ("A".equals(kindcode)) {

src/main/java/com/ydtech/modules/ins/controller/InsTiananController.java

@@ -10,7 +10,6 @@ import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmAgreement;
 import com.ydtech.modules.esm.model.EsmAgreementProd;
 import com.ydtech.modules.esm.model.EsmAgreementProdfee;
-import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.*;
 import com.ydtech.modules.ins.model.*;
 import com.ydtech.modules.ins.model.vo.*;
@@ -249,7 +248,7 @@ public class InsTiananController {
 //        ZG01005	交强+三者  交强+三者（三者的费用）
 //        ZG01006	交强+商业  交强+商业（交强的费用）
 //        ZG01007	交强+商业  交强+商业（商业的费用）
-        List<KindInfoVo> kinds = quoteInfo.getKindList();
+        List<KingInfoVo> kinds = quoteInfo.getKindList();
         String productId = "";
         String productname = "";
         List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +
@@ -549,8 +548,8 @@ public class InsTiananController {
         TaCombosData combosData = new TaCombosData();
         combosData.setComboNo("000101");
         List<TaKindDto> itemKindList = new ArrayList<TaKindDto>();
-        List<KindInfoVo> kindList = quoteInfoVo.getKindList();
-        for (KindInfoVo kind : kindList) {
+        List<KingInfoVo> kindList = quoteInfoVo.getKindList();
+        for (KingInfoVo kind : kindList) {
             TaKindDto kindDto = new TaKindDto();
             if ("A".equals(kind.getKindCode())) {
                 kindDto.setKindCode("01");

src/main/java/com/ydtech/modules/ins/model/HnQuoteInfo.java

@@ -1,6 +1,6 @@
 package com.ydtech.modules.ins.model;
 
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 
 import java.util.List;
@@ -16,7 +16,7 @@ public class HnQuoteInfo {
     private HnCustomer customer;
     private HnTax tax;
     private List<RiskInfoVo> riskList;
-    private List<KindInfoVo> kindList;
+    private List<KingInfoVo> kindList;
     private boolean updateDateFlag;
 
     public HnCar getCar() {
@@ -51,11 +51,11 @@ public class HnQuoteInfo {
         this.riskList = riskList;
     }
 
-    public List<KindInfoVo> getKindList() {
+    public List<KingInfoVo> getKindList() {
         return kindList;
     }
 
-    public void setKindList(List<KindInfoVo> kindList) {
+    public void setKindList(List<KingInfoVo> kindList) {
         this.kindList = kindList;
     }
 

src/main/java/com/ydtech/modules/ins/model/cbit/BusinessPolicy.java

@@ -1,6 +1,6 @@
 package com.ydtech.modules.ins.model.cbit;
 
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import lombok.Data;
 
 import java.text.SimpleDateFormat;
@@ -23,11 +23,11 @@ public class BusinessPolicy {
 
     }
 
-    public BusinessPolicy(Date v_startDate, List<KindInfoVo> kindList) {
+    public BusinessPolicy(Date v_startDate, List<KingInfoVo> kindList) {
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         this.startDate = df.format(v_startDate);
         List<Coverage> coverages = new ArrayList<Coverage>();
-        for (KindInfoVo kindInfoVo : kindList) {
+        for (KingInfoVo kindInfoVo : kindList) {
             coverages.add(new Coverage(kindInfoVo.getKindCode(), new Double(kindInfoVo.getAmount()).toString(), kindInfoVo.getExtendInfos()));
         }
 

src/main/java/com/ydtech/modules/ins/model/cbit/CBITQuoteInfoVo.java

@@ -3,7 +3,7 @@ package com.ydtech.modules.ins.model.cbit;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import lombok.Data;
 
 import java.util.List;
@@ -23,7 +23,7 @@ public class CBITQuoteInfoVo {
     private CustomerInfoVo policyHolderInfo;
     private CustomerInfoVo insuredPersonInfo;
     private List<CBITRiskInfoVo> riskList;
-    private List<KindInfoVo> kindList;
+    private List<KingInfoVo> kindList;
     private String userId;
     private String quoteno;
     private String orderno;

src/main/java/com/ydtech/modules/ins/model/guoren/PremiumReq.java

@@ -9,7 +9,7 @@ import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.InsurKindGuoRen;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.api.guoren.constants.BaseTaxation;
 import com.ydtech.modules.order.entity.api.guoren.constants.ClauseTypeSystem;
@@ -73,7 +73,7 @@ public class PremiumReq {
         CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
 
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
-        List<KindInfoVo> kindInfoVList = yaQuoteInfoVo.getKindList();
+        List<KingInfoVo> kindInfoVList = yaQuoteInfoVo.getKingList();
 
         PremiumReq quoteReq = new PremiumReq();
         VehicleAndVesselTax vehicleAndVesselTax = yaQuoteInfoVo.getVehicleAndVesselTax();
@@ -204,7 +204,7 @@ public class PremiumReq {
      * @date: 2023-08-15
      */
     @JsonIgnore
-    public static BiDTO buildBiDto(CustomerInfoVo ownerInfo, RiskInfoVo biRiskInfo, List<KindInfoVo> kindInfoVList,
+    public static BiDTO buildBiDto(CustomerInfoVo ownerInfo, RiskInfoVo biRiskInfo, List<KingInfoVo> kindInfoVList,
                                    CarPriceResp.DataDTO carPriceResult, VinQueryResp.DataDTO vinQ, boolean isNoCar,
                                    List<GuoRenSpecialAgreementVo> specialAgreementVo) {
 
@@ -295,7 +295,7 @@ public class PremiumReq {
         return biDto;
     }
 
-    private static List<BiDTO.PrptitemkindListDTO> buildBiKindList(List<KindInfoVo> kindInfoVList, CarPriceResp.DataDTO carPriceResult,
+    private static List<BiDTO.PrptitemkindListDTO> buildBiKindList(List<KingInfoVo> kindInfoVList, CarPriceResp.DataDTO carPriceResult,
                                                                    RiskInfoVo biRiskInfo, VinQueryResp.DataDTO vinQ) {
         List<BiDTO.PrptitemkindListDTO> prptitemkindList = new ArrayList<>();
         kindInfoVList.forEach(k -> {

src/main/java/com/ydtech/modules/ins/model/vo/CarInfoVo.java

@@ -1,10 +1,14 @@
 package com.ydtech.modules.ins.model.vo;
 
 import com.ydtech.constants.enums.dict.insurance.EnergyType;
+import com.ydtech.modules.order.entity.InsAreaCompanyCarInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
 import com.ydtech.validation.annotation.CheckDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 
@@ -182,4 +186,15 @@ public class CarInfoVo implements Serializable {
         return EnergyType.isNewEnergy(energyType);
     }
 
+    public InsAreaCompanyCarInfo toInsAreaCompanyCarInfo() {
+        InsAreaCompanyCarInfo insAreaCompanyCarInfo = new InsAreaCompanyCarInfo();
+        BeanUtils.copyProperties(this, insAreaCompanyCarInfo);
+        return insAreaCompanyCarInfo;
+    }
+
+    public InsOrdersCarInfo toInsOrdersCarInfo() {
+        InsOrdersCarInfo insOrdersCarInfo = new InsOrdersCarInfo();
+        BeanUtils.copyProperties(this, insOrdersCarInfo);
+        return insOrdersCarInfo;
+    }
 }

src/main/java/com/ydtech/modules/ins/model/vo/CustomerInfoVo.java

@@ -1,5 +1,7 @@
 package com.ydtech.modules.ins.model.vo;
 
+import com.ydtech.modules.order.entity.InsAreaCompanyCarUserInfo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.validation.annotation.CheckDateTime;
 import com.ydtech.validation.annotation.CheckIdentifyNumber;
 import io.swagger.annotations.ApiModel;
@@ -7,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Bean;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -65,4 +69,15 @@ public class CustomerInfoVo implements Serializable {
     @ApiModelProperty(value = "同投保人")
     private boolean insuranceHolder;
 
+    public InsAreaCompanyCarUserInfo toInsAreaCompanyCarUserInfo() {
+        InsAreaCompanyCarUserInfo insAreaCompanyCarUserInfo = new InsAreaCompanyCarUserInfo();
+        BeanUtils.copyProperties(this, insAreaCompanyCarUserInfo);
+        return insAreaCompanyCarUserInfo;
+    }
+
+    public InsOrdersCarUserInfo toInsOrdersCarUserInfo() {
+        InsOrdersCarUserInfo insOrdersCarUserInfo = new InsOrdersCarUserInfo();
+        BeanUtils.copyProperties(this, insOrdersCarUserInfo);
+        return insOrdersCarUserInfo;
+    }
 }

src/main/java/com/ydtech/modules/ins/model/vo/KindInfoVo.java → src/main/java/com/ydtech/modules/ins/model/vo/KingInfoVo.java

@@ -1,8 +1,11 @@
 package com.ydtech.modules.ins.model.vo;
 
+import com.ydtech.modules.order.entity.InsAreaCompanyKing;
+import com.ydtech.modules.order.entity.po.InsOrdersKing;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -15,7 +18,7 @@ import java.util.Map;
  */
 @Data
 @ApiModel("商业险")
-public class KindInfoVo implements Serializable {
+public class KingInfoVo implements Serializable {
 
     private static final long serialVersionUID = 1532163062666108692L;
 
@@ -50,5 +53,16 @@ public class KindInfoVo implements Serializable {
     //serviceGrade： 服务款别
     private Map<String, String> extendInfos;
 
+    public InsOrdersKing toInsOrdersKing() {
+        InsOrdersKing insOrdersKing = new InsOrdersKing();
+        BeanUtils.copyProperties(this,insOrdersKing);
+        return insOrdersKing;
+    }
+
+    public InsAreaCompanyKing toInsAreaCompanyKing(){
+        InsAreaCompanyKing insAreaCompanyKing = new InsAreaCompanyKing();
+        BeanUtils.copyProperties(this,insAreaCompanyKing);
+        return insAreaCompanyKing;
+    }
 
 }

src/main/java/com/ydtech/modules/ins/model/vo/QuoteInfoVo.java

@@ -20,7 +20,7 @@ public class QuoteInfoVo {
     private CustomerInfoVo policyHolderInfo;
     private CustomerInfoVo insuredPersonInfo;
     private List<RiskInfoVo> riskList;
-    private List<KindInfoVo> kindList;
+    private List<KingInfoVo> kindList;
     private String userId;
     private String quoteno;
     private CBITBaseparam baseParam;

src/main/java/com/ydtech/modules/ins/model/vo/QuoteKindRespVo.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.ins.model.vo;
 
+import com.ydtech.modules.order.entity.InsAreaCompanyKing;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -45,6 +46,24 @@ public class QuoteKindRespVo {
 
     private double unitAmount;
 
-
+    public static InsAreaCompanyKing toInsAreaCompanyKing(QuoteKindRespVo quoteKindRespVo){
+        InsAreaCompanyKing insAreaCompanyKing = new InsAreaCompanyKing();
+        insAreaCompanyKing.setAmount(quoteKindRespVo.getAmount());
+        insAreaCompanyKing.setCoveragePremium(quoteKindRespVo.getCoveragePremium());
+        insAreaCompanyKing.setDeductible(quoteKindRespVo.getDeductible());
+        insAreaCompanyKing.setDeductibleRate(String.valueOf(quoteKindRespVo.getDeductibleRate()));
+        insAreaCompanyKing.setKindCode(quoteKindRespVo.getKindCode());
+        insAreaCompanyKing.setKindName(quoteKindRespVo.getKindName());
+//        insAreaCompanyKing.setModeCode(quoteKindRespVo.getModeCode());
+//        insAreaCompanyKing.setModeName(quoteKindRespVo.getModeName());
+        insAreaCompanyKing.setNotDeductibleFlag(String.valueOf(quoteKindRespVo.isNotDeductibleFlag()));
+//        insAreaCompanyKing.setQuantity(quoteKindRespVo.getQuantity());
+        insAreaCompanyKing.setRate(quoteKindRespVo.getRate());
+//        insAreaCompanyKing.setRiskCode(quoteKindRespVo.getRiskCode());
+        insAreaCompanyKing.setServiceTimes(quoteKindRespVo.getServiceTimes());
+        insAreaCompanyKing.setUnitAmount(quoteKindRespVo.getUnitAmount());
+        return insAreaCompanyKing;
+
+    }
 
 }

src/main/java/com/ydtech/modules/ins/model/vo/QuoteRiskRespVo.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.model.vo;
 
 import com.ydtech.constants.enums.InsuranceRisk;
+import com.ydtech.modules.order.entity.InsAreaCompanyRisk;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -57,4 +58,21 @@ public class QuoteRiskRespVo {
         return riskList1;
     }
 
+    public static InsAreaCompanyRisk toInsAreaCompanyRisk(QuoteRiskRespVo quoteRiskRespVo){
+        InsAreaCompanyRisk insAreaCompanyRisk = new InsAreaCompanyRisk();
+        insAreaCompanyRisk.setAmount(String.valueOf(quoteRiskRespVo.getAmount()));
+        insAreaCompanyRisk.setCommissionAmount(String.valueOf(quoteRiskRespVo.getCommissionAmount()));
+        insAreaCompanyRisk.setCommissionRate(String.valueOf(quoteRiskRespVo.getCommissionRate()));
+        insAreaCompanyRisk.setEndDate(quoteRiskRespVo.getEndDate());
+//        insAreaCompanyRisk.setInstantFlag(quoteRiskRespVo.getInstantFlag());
+        insAreaCompanyRisk.setNoTaxPremium(String.valueOf(quoteRiskRespVo.getNoTaxPremium()));
+        insAreaCompanyRisk.setPremium(String.valueOf(quoteRiskRespVo.getPremium()));
+//        insAreaCompanyRisk.setQuotePreceptCode(quoteRiskRespVo.getQuotePreceptCode());
+//        insAreaCompanyRisk.setQuotePreceptName(quoteRiskRespVo.getQuotePreceptName());
+        insAreaCompanyRisk.setRiskCode(quoteRiskRespVo.getRiskCode());
+        insAreaCompanyRisk.setRiskName(quoteRiskRespVo.getRiskName());
+        insAreaCompanyRisk.setStartDate(quoteRiskRespVo.getStartDate());
+        return insAreaCompanyRisk;
+    }
+
 }

src/main/java/com/ydtech/modules/ins/model/vo/RiskInfoVo.java

@@ -1,6 +1,9 @@
 package com.ydtech.modules.ins.model.vo;
 
+import com.ydtech.modules.order.entity.InsAreaCompanyRisk;
+import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import com.ydtech.validation.annotation.CheckDateTime;
+import org.springframework.beans.BeanUtils;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -76,4 +79,16 @@ public class RiskInfoVo implements Serializable {
     public void setInstantFlag(String instantFlag) {
         this.instantFlag = instantFlag;
     }
+
+    public InsAreaCompanyRisk toInsAreaCompanyRisk(){
+        InsAreaCompanyRisk insAreaCompanyRisk = new InsAreaCompanyRisk();
+        BeanUtils.copyProperties(this, insAreaCompanyRisk);
+        return insAreaCompanyRisk;
+    }
+
+    public InsOrdersRisk toInsOrdersRisk(){
+        InsOrdersRisk insOrdersRisk = new InsOrdersRisk();
+        BeanUtils.copyProperties(this, insOrdersRisk);
+        return insOrdersRisk;
+    }
 }

src/main/java/com/ydtech/modules/ins/model/ya/YaQuoteInfoVo.java

@@ -2,9 +2,11 @@ package com.ydtech.modules.ins.model.ya;
 
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.bo.InsOrdersBo;
+import com.ydtech.modules.order.entity.po.InsOrdersKing;
+import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -12,6 +14,7 @@ import javax.validation.Valid;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author gws
@@ -43,7 +46,7 @@ public class YaQuoteInfoVo implements Serializable {
     private List<RiskInfoVo> riskList;
 
     @Valid
-    private List<KindInfoVo> kindList;
+    private List<KingInfoVo> kingList;
 
     private String quoteno;
 
@@ -54,12 +57,12 @@ public class YaQuoteInfoVo implements Serializable {
     }
 
     public YaQuoteInfoVo(InsOrdersBo insOrders) {
-        this.ownerInfo = insOrders.getOwnerinfo();
-        this.policyHolderInfo = insOrders.getApplyinfo();
-        this.insuredPersonInfo = insOrders.getInsureinfo();
-        this.carInfo = insOrders.getCarinfo();
-        this.riskList = insOrders.getRisk();
-        this.kindList = insOrders.getKing();
+        this.ownerInfo = insOrders.getOwnerinfo().toCustomerInfoVo();
+        this.policyHolderInfo = insOrders.getApplyinfo().toCustomerInfoVo();
+        this.insuredPersonInfo = insOrders.getInsureinfo().toCustomerInfoVo();
+        this.carInfo = insOrders.getCarinfo().toCarInfoVo();
+        this.riskList = insOrders.getRisk().stream().map(InsOrdersRisk::toRiskInfoVo).collect(Collectors.toList());
+        this.kingList = insOrders.getKing().stream().map(InsOrdersKing::toKingInfoVo).collect(Collectors.toList());;
         this.quoteno = insOrders.getQuoteno();
     }
 

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -356,7 +356,7 @@ public class YcBuildData {
      * @author: lig
      * @date: 2023年03月27日 0027
      */
-    public static String gainNPerAmt(KindInfoVo a) {
+    public static String gainNPerAmt(KingInfoVo a) {
 
         if (a.getUnitAmount() > 0) {
             return (int) a.getUnitAmount() + "";

src/main/java/com/ydtech/modules/ins/model/yc/audit/Audit.java

@@ -10,6 +10,7 @@ import com.ydtech.modules.ins.model.yc.YcConfigureParameters;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.bo.InsOrdersBo;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.utils.IDCardUtils;
 import lombok.Data;
 
@@ -223,11 +224,11 @@ public class Audit {
     public static Audit buildAuditParam(InsOrdersBo order, YcConfigureParameters ycConfigureParameters, InsAreaCompany iac) {
 
         //车主
-        CustomerInfoVo ownerInfo = order.getOwnerinfo();
+        InsOrdersCarUserInfo ownerInfo = order.getOwnerinfo();
         //被保人
-        CustomerInfoVo insureInfo = order.getInsureinfo();
+        InsOrdersCarUserInfo insureInfo = order.getInsureinfo();
         //投保人
-        CustomerInfoVo applyInfo = order.getApplyinfo();
+        InsOrdersCarUserInfo applyInfo = order.getApplyinfo();
 
         Audit m = new Audit();
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/CvrgListSY.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.ydtech.constants.enums.InsurKind;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.yc.YcBuildData;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
@@ -77,7 +77,7 @@ public class CvrgListSY {
      * @param newEnergy 是否是新能源
      * @return 永诚险种列表
      */
-    public static CvrgListSY buildCvrgListSY(List<KindInfoVo> kindList, Vhl vhl, boolean newEnergy) {
+    public static CvrgListSY buildCvrgListSY(List<KingInfoVo> kindList, Vhl vhl, boolean newEnergy) {
         //乘客
         String passenger = StringUtils.toString(StringUtils.toInt(vhl.getNSeatNum()) - 1);
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Ruote.java

@@ -223,7 +223,7 @@ public class Ruote {
          * 代码：cvrgListSY/CvrgSY
          */
 
-        CvrgListSY cvrgListSY = CvrgListSY.buildCvrgListSY(yaQuoteInfoVo.getKindList(), vhl, carInfo.isNewEnergy());
+        CvrgListSY cvrgListSY = CvrgListSY.buildCvrgListSY(yaQuoteInfoVo.getKingList(), vhl, carInfo.isNewEnergy());
         condition.setCvrgListSY(cvrgListSY);
 
         /**

src/main/java/com/ydtech/modules/ins/service/impl/InsCBITServiceImpl.java

@@ -13,7 +13,7 @@ import com.ydtech.modules.ins.service.InsCBITService;
 import com.ydtech.modules.ins.service.SysCbitErrorService;
 import com.ydtech.modules.ins.service.SysCbitLogService;
 import com.ydtech.modules.ins.model.vo.CarModelQryVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.utils.HttpsPostUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -361,7 +361,7 @@ public class InsCBITServiceImpl implements InsCBITService {
             //交强商业险加工
             TrafficPolicy trafficPolicy = null;
             BusinessPolicy businessPolicy = null;
-            List<KindInfoVo> kindList_n = new ArrayList<>();
+            List<KingInfoVo> kindList_n = new ArrayList<>();
             Date startdate_sy = new Date();
             SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -415,12 +415,12 @@ public class InsCBITServiceImpl implements InsCBITService {
         return quoteRespData;
     }
 
-    private List<KindInfoVo> geneKindInfo(CBITQuoteInfoVo quoteInfo) {
-        List<KindInfoVo> kindList = quoteInfo.getKindList();
-        List<KindInfoVo> kindList_n = new ArrayList<>();
+    private List<KingInfoVo> geneKindInfo(CBITQuoteInfoVo quoteInfo) {
+        List<KingInfoVo> kindList = quoteInfo.getKindList();
+        List<KingInfoVo> kindList_n = new ArrayList<>();
         for (int j = 0; j < kindList.size(); j++) {
 
-            KindInfoVo kindInfoVo = kindList.get(j);
+            KingInfoVo kindInfoVo = kindList.get(j);
             String deductibleRate = kindInfoVo.getDeductibleRate();
             BigDecimal setScale = null;
             if (deductibleRate != null) {
@@ -442,14 +442,14 @@ public class InsCBITServiceImpl implements InsCBITService {
 
             //第三者责任险
             if (kindList.get(j).getKindCode().equals("B")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301600");
                 kindInfo.setAmount(kindList.get(j).getAmount());
                 kindList_n.add(kindInfo);
             }
             //乘客责任险
             if (kindList.get(j).getKindCode().equals("D4")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301702");
                 kindInfo.setAmount(kindList.get(j).getUnitAmount());
                 Map<String, String> extendInfos = new HashMap<String, String>();
@@ -459,7 +459,7 @@ public class InsCBITServiceImpl implements InsCBITService {
             }
             //机动车损失险
             if (kindList.get(j).getKindCode().equals("A")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301200");
                 kindInfo.setAmount(quoteInfo.getVehicleModel_QueRen().getCurrentValue().doubleValue());
                 Map<String, String> extendInfos = new HashMap<String, String>();
@@ -469,7 +469,7 @@ public class InsCBITServiceImpl implements InsCBITService {
             }
             //司机责任险
             if (kindList.get(j).getKindCode().equals("D3")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301701");
                 kindInfo.setAmount(kindList.get(j).getAmount());
                 /*Map<String, String> extendInfos =new HashMap<String, String>();
@@ -479,7 +479,7 @@ public class InsCBITServiceImpl implements InsCBITService {
             }
             //附加绝对免赔率特约条款（车损）
             if (kindList.get(j).getKindCode().equals("MJ1")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301007");
                 kindInfo.setAmount(kindList.get(j).getAmount());
                 Map<String, String> extendInfos = new HashMap<String, String>();
@@ -490,7 +490,7 @@ public class InsCBITServiceImpl implements InsCBITService {
             }
             //绝对免赔率特约险（三者）
             if (kindList.get(j).getKindCode().equals("MJ2")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301008");
                 kindInfo.setAmount(kindList.get(j).getAmount());
                 Map<String, String> extendInfos = new HashMap<String, String>();
@@ -500,7 +500,7 @@ public class InsCBITServiceImpl implements InsCBITService {
             }
             //绝对免赔率特约险（司机）
             if (kindList.get(j).getKindCode().equals("MJ3")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301009");
                 kindInfo.setAmount(kindList.get(j).getAmount());
                 Map<String, String> extendInfos = new HashMap<String, String>();
@@ -511,7 +511,7 @@ public class InsCBITServiceImpl implements InsCBITService {
             }
             //绝对免赔率特约险（乘客）
             if (kindList.get(j).getKindCode().equals("MJ4")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301010");
                 kindInfo.setAmount(kindList.get(j).getAmount());
                 Map<String, String> extendInfos = new HashMap<String, String>();
@@ -522,14 +522,14 @@ public class InsCBITServiceImpl implements InsCBITService {
             }
             //车身划痕险
             if (kindList.get(j).getKindCode().equals("L")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301210");
                 kindInfo.setAmount(kindList.get(j).getAmount());
                 kindList_n.add(kindInfo);
             }
             //法定节假日限额翻倍险
             if (kindList.get(j).getKindCode().equals("BD")) {
-                KindInfoVo kindInfo = new KindInfoVo();
+                KingInfoVo kindInfo = new KingInfoVo();
                 kindInfo.setKindCode("0301604");
                 kindInfo.setAmount(kindList.get(j).getAmount());
                 kindList_n.add(kindInfo);
@@ -570,7 +570,7 @@ public class InsCBITServiceImpl implements InsCBITService {
             //交强商业险加工
             TrafficPolicy trafficPolicy = null;
             BusinessPolicy businessPolicy = null;
-            List<KindInfoVo> kindList_n = new ArrayList<>();
+            List<KingInfoVo> kindList_n = new ArrayList<>();
             Date startdate_sy = new Date();
             SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 

src/main/java/com/ydtech/modules/nai/controller/ChinaCoalInterface.java

@@ -12,7 +12,7 @@ import com.ydtech.modules.esm.model.*;
 import com.ydtech.modules.esm.service.*;
 import com.ydtech.modules.ins.model.*;
 import com.ydtech.modules.ins.service.*;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.QuoteKindRespVo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.ins.model.vo.QuoteRiskRespVo;
@@ -367,10 +367,10 @@ public class ChinaCoalInterface {
         for (int i = 0; i < riskList.size(); i++) {
             ContractVO contractVOx = new ContractVO();
             if (riskList.get(i).getRiskCode().equals("0510")) {
-                List<KindInfoVo> kindList = record.getKindList();
+                List<KingInfoVo> kindList = record.getKindList();
                 for (int j = 0; j < kindList.size(); j++) {
 
-                    KindInfoVo kindInfoVo = kindList.get(j);
+                    KingInfoVo kindInfoVo = kindList.get(j);
                     String deductibleRate = kindInfoVo.getDeductibleRate();
                     BigDecimal setScale = null;
                     if (deductibleRate != null) {
@@ -647,7 +647,7 @@ public class ChinaCoalInterface {
 //        ZG01005	交强+三者  交强+三者（三者的费用）
 //        ZG01006	交强+商业  交强+商业（交强的费用）
 //        ZG01007	交强+商业  交强+商业（商业的费用）
-            List<KindInfoVo> kinds = record.getKindList();
+            List<KingInfoVo> kinds = record.getKindList();
             String productId = "";
             String productname = "";
             List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +

src/main/java/com/ydtech/modules/nai/httpvo/OfferVO.java

@@ -1,6 +1,6 @@
 package com.ydtech.modules.nai.httpvo;
 
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 
 import java.util.List;
 
@@ -18,7 +18,7 @@ public class OfferVO {
     private ZMPolicyHolderInfoVO policyHolderInfo;
     private ZMInsuredPersonInfoVO insuredPersonInfo;
     private List<ZMRiskListVO> riskList;
-    private List<KindInfoVo> kindList;
+    private List<KingInfoVo> kindList;
 
     public String getUserId() {
         return userId;
@@ -76,11 +76,11 @@ public class OfferVO {
         this.riskList = riskList;
     }
 
-    public List<KindInfoVo> getKindList() {
+    public List<KingInfoVo> getKindList() {
         return kindList;
     }
 
-    public void setKindList(List<KindInfoVo> kindList) {
+    public void setKindList(List<KingInfoVo> kindList) {
         this.kindList = kindList;
     }
 }

src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -6,9 +6,8 @@ import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.constants.sys.SystemConstant;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.service.SysUserRoleService;
-import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
@@ -60,12 +59,12 @@ public class QuoteVerificationAspect {
                 //税源查询
                 BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(orderno, agreementId);
                 String productid ;
-                List<KindInfoVo> kinds = quoteInfo.getKindList();
+                List<KingInfoVo> kinds = quoteInfo.getKingList();
                 List<RiskInfoVo> risks = quoteInfo.getRiskList();
 
                 boolean haveCarDamageKind = false;//是否含车损
                 boolean haveBusiKind = false;//是否含车损外的商业险种
-                for (KindInfoVo kindInfoVo : kinds) {
+                for (KingInfoVo kindInfoVo : kinds) {
                     String code = kindInfoVo.getKindCode();
                     // 车损
                     if ("A".equalsIgnoreCase(code)) {

src/main/java/com/ydtech/modules/order/components/dajia/DaJiaRequestApiComponents.java

@@ -39,6 +39,9 @@ public class DaJiaRequestApiComponents {
 
     private final DaJiaApiConfigurationProperties apiComponents;
 
+    public static String daJiaReqRedisKey = "daJia:reqTxt:buisId:";
+
+
     @Value("${dajia.api.encryptKey}")
     private String encryptKey;
 

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -115,7 +115,7 @@ public class InsOrdersController extends BaseController {
     @PostMapping("/queryQuoteHistory")
     @ApiOperation(value = "查询报价历史")
     public HttpResult<List<InsAreaCompanyHistoryVo>> queryQuoteHistory(@RequestBody QuoteHistoryVo quoteHistoryVo) {
-        InsOrders insOrders = this.insOrdersService.existOrder(quoteHistoryVo.getOrderNo());
+        InsOrdersBo insOrders = this.insOrdersService.existOrder(quoteHistoryVo.getOrderNo());
 
         LambdaQueryWrapper<InsAreaCompany> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderNo()), InsAreaCompany::getOrderno, quoteHistoryVo.getOrderNo()).eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderStatus()), InsAreaCompany::getOrderstatus, quoteHistoryVo.getOrderStatus()).orderByDesc(InsAreaCompany::getCreatetime);

src/main/java/com/ydtech/modules/order/controller/OrderTaskPoolsController.java

@@ -5,6 +5,7 @@ import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.vo.OrderTaskPoolsVo;
 import com.ydtech.modules.order.entity.vo.TaskForwardingVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
@@ -55,7 +56,7 @@ public class OrderTaskPoolsController {
     @PostMapping("/queryOrderInfo")
     @ApiOperation(value = "通过主订单ID查询子订单")
     public HttpResult queryInsAreaCompany(@RequestSingleParam(value = "orderNo") String orderNo) {
-        InsOrders insOrders = this.insOrdersService.existOrder(orderNo);
+        InsOrdersBo insOrders = this.insOrdersService.existOrder(orderNo);
         List<InsAreaCompany> insAreaCompanies = this.insAreaCompanyService.query().eq("orderno", orderNo).list();
         insOrders.setInsAreaCompanyList(insAreaCompanies);
         return HttpResult.ok("success", insOrders);

src/main/java/com/ydtech/modules/order/controller/YongChengOrderApiController.java

@@ -61,8 +61,8 @@ public class YongChengOrderApiController {
     @ApiOperation(value = "永诚API方式 - 影像上传")
     @PostMapping(value = "/uploadImage")
     public HttpResult uploadImageApi(@RequestSingleParam(value = "companyId") String companyId) {
-        return yongchengOrderApiService.uploadImageApi(companyId);
-//        return HttpResult.ok("ok");
+//        return yongchengOrderApiService.uploadImageApi(companyId);
+        return HttpResult.ok("ok");
     }
 
     @ApiOperation(value = "永诚API方式 -电子保单")

src/main/java/com/ydtech/modules/order/dao/InsOrdersKindMapper.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.order.entity.po.InsOrdersKind;
+import com.ydtech.modules.order.entity.po.InsOrdersKing;
 
 /**
 * @author Administrator
@@ -9,7 +9,7 @@ import com.ydtech.modules.order.entity.po.InsOrdersKind;
 * @createDate 2024-03-05 15:06:04
 * @Entity generator.domain.InsOrdersKind
 */
-public interface InsOrdersKindMapper extends BaseMapper<InsOrdersKind> {
+public interface InsOrdersKindMapper extends BaseMapper<InsOrdersKing> {
 
 }
 

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyKing.java

@@ -3,8 +3,9 @@ package com.ydtech.modules.order.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.order.entity.po.InsOrdersKind;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
+import com.ydtech.modules.ins.model.vo.QuoteKindRespVo;
+import com.ydtech.modules.order.entity.po.InsOrdersKing;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
@@ -85,7 +86,7 @@ public class InsAreaCompanyKing implements Serializable {
 
     }
 
-    public InsAreaCompanyKing(KindInfoVo kindInfoVo, String orderNo) {
+    public InsAreaCompanyKing(KingInfoVo kindInfoVo, String orderNo) {
         this.companyId = orderNo;
         this.amount = kindInfoVo.getAmount();
         this.unitAmount = kindInfoVo.getUnitAmount();
@@ -94,12 +95,25 @@ public class InsAreaCompanyKing implements Serializable {
         this.deductibleRate = kindInfoVo.getDeductibleRate();
     }
 
-    public static List<InsOrdersKind> buildKindList(String orderNo, List<KindInfoVo> risk) {
-        return risk.stream().map(x -> new InsOrdersKind(x, orderNo)).collect(Collectors.toList());
+    public InsAreaCompanyKing(QuoteKindRespVo kingInfoVo, String orderNo) {
+        this.companyId = orderNo;
+        this.amount = kingInfoVo.getAmount();
+        this.unitAmount = kingInfoVo.getUnitAmount();
+        this.kindCode = kingInfoVo.getKindCode();
+        this.kindName = kingInfoVo.getKindName();
+        this.deductibleRate = String.valueOf(kingInfoVo.getDeductibleRate());
+    }
+
+    public static List<InsOrdersKing> buildKingList(String orderNo, List<KingInfoVo> risk) {
+        return risk.stream().map(x -> new InsOrdersKing(x, orderNo)).collect(Collectors.toList());
+    }
+
+    public static List<InsAreaCompanyKing> buildQuoteKingList(String orderNo, List<QuoteKindRespVo> risk) {
+        return risk.stream().map(x -> new InsAreaCompanyKing(x, orderNo)).collect(Collectors.toList());
     }
 
-    public KindInfoVo toKindInfoVo() {
-        KindInfoVo kindInfoVo = new KindInfoVo();
+    public KingInfoVo toKindInfoVo() {
+        KingInfoVo kindInfoVo = new KingInfoVo();
         kindInfoVo.setAmount(this.amount);
         kindInfoVo.setUnitAmount(this.unitAmount);
         kindInfoVo.setKindCode(this.kindCode);

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyRisk.java

@@ -3,11 +3,11 @@ package com.ydtech.modules.order.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ydtech.modules.ins.model.vo.QuoteRiskRespVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -100,10 +100,24 @@ public class InsAreaCompanyRisk implements Serializable {
 //        this.instantFlag = riskInfoVo.getInstantFlag();
     }
 
+    public InsAreaCompanyRisk(QuoteRiskRespVo riskInfoVo, String orderNo) {
+        this.companyId = orderNo;
+        this.amount = String.valueOf(riskInfoVo.getAmount());
+        this.premium = String.valueOf(riskInfoVo.getPremium());
+        this.startDate = riskInfoVo.getStartDate();
+        this.endDate = riskInfoVo.getEndDate();
+        this.riskCode = riskInfoVo.getRiskCode();
+//        this.instantFlag = riskInfoVo.getInstantFlag();
+    }
+
     public static List<InsOrdersRisk> buildRiskList(String orderNo, List<RiskInfoVo> risk) {
         return risk.stream().map(x -> new InsOrdersRisk(x, orderNo)).collect(Collectors.toList());
     }
 
+    public static List<InsAreaCompanyRisk> buildQuoteRiskList(String orderNo, List<QuoteRiskRespVo> risk) {
+        return risk.stream().map(x -> new InsAreaCompanyRisk(x, orderNo)).collect(Collectors.toList());
+    }
+
     public RiskInfoVo toRiskInfoVo() {
         RiskInfoVo riskInfoVo = new RiskInfoVo();
         riskInfoVo.setAmount(Double.parseDouble(this.amount));

src/main/java/com/ydtech/modules/order/entity/InsOrderQrCode.java

@@ -1,37 +1,21 @@
 package com.ydtech.modules.order.entity;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
-import com.ydtech.constants.enums.InsuranceRisk;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.constants.enums.dict.agreement.ProductsType;
-import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.ins.model.vo.RiskInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.*;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Base64;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 保险订单二维码表

src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -1,13 +1,9 @@
 package com.ydtech.modules.order.entity;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
@@ -15,10 +11,8 @@ import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.ins.model.OwnerInfo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
-import com.ydtech.modules.order.entity.po.*;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import lombok.*;
 
@@ -172,38 +166,6 @@ public class InsOrders implements Serializable {
     @TableField(exist = false)
     private List<InsAreaCompany> insAreaCompanyList; //子级集合
 
-    /**
-     * 车辆信息
-     */
-    @TableField(exist = false)
-    private InsOrdersCarInfo carinfo;
-
-    /**
-     * 投保人信息
-     */
-    @TableField(exist = false)
-    private InsOrdersCarUserInfo applyinfo;
-
-    /**
-     * 车主信息
-     */
-    @TableField(exist = false)
-    private InsOrdersCarUserInfo ownerinfo;
-
-    /**
-     * 被保人信息
-     */
-    @TableField(exist = false)
-    private InsOrdersCarUserInfo insureinfo;
-
-//    @TableField(exist = false)
-//    private List<InsOrdersRisk> risk;
-
-//    @TableField(exist = false)
-//    private List<InsOrdersKind> kind;
-
-    @TableField(exist = false)
-    private InsOrdersTax vehicleAndVesselTax;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -219,36 +181,20 @@ public class InsOrders implements Serializable {
         this.setFrameno(quoteInfoVo.getCarInfo().getFrameNo());
         this.setLicenseno(quoteInfoVo.getCarInfo().getLicenseNo());
 
-        // 2.1 车辆信息
-
-//        this.setCarinfo(JSON.parseObject(JSON.toJSONString(quoteInfoVo.getCarInfo())));
         this.setUserid(user.getId());
         this.setUsername(user.getName());
         this.setDeptid(user.getDeptId());
         this.setDeptname(dept == null ? "" : dept.getName());
 
-        // 2.2 人员信息
-//        this.setOwnerinfo(JSON.parseObject(JSON.toJSONString(quoteInfoVo.getOwnerInfo())));
-//        this.setApplyinfo(JSON.parseObject(JSON.toJSONString(quoteInfoVo.getPolicyHolderInfo())));
-//        this.setInsureinfo(JSON.parseObject(JSON.toJSONString(quoteInfoVo.getInsuredPersonInfo())));
         this.setInsuredname(quoteInfoVo.getPolicyHolderInfo().getName());
 
         List<RiskInfoVo> risks = quoteInfoVo.getRiskList();
-        List<KindInfoVo> kinds = quoteInfoVo.getKindList();
+        List<KingInfoVo> kinds = quoteInfoVo.getKingList();
 
-        // 2.3 主险种信息
         this.insuranceInformation(risks, kinds);
 
-        // 2.3.1 险种信息
-//        this.setRisk(JSON.parseArray(JSON.toJSONString(quoteInfoVo.getRiskList())));
-//        this.setKing(JSON.parseArray(JSON.toJSONString(quoteInfoVo.getKindList())));
-
-        // 2.4 产品信息
         this.productInformation(risks, kinds);
         this.setCreatetime(LocalDateTime.now());
-
-        // 2.5 车船税信息
-//        this.setVehicleAndVesselTax(JSON.parseObject(JSON.toJSONString(quoteInfoVo.getVehicleAndVesselTax())));
     }
 
     /**
@@ -257,7 +203,7 @@ public class InsOrders implements Serializable {
      * @param risks 主险种
      * @param kinds 商业险险种
      */
-    private void insuranceInformation(List<RiskInfoVo> risks, List<KindInfoVo> kinds) {
+    private void insuranceInformation(List<RiskInfoVo> risks, List<KingInfoVo> kinds) {
         for (RiskInfoVo riskInfoVo : risks) {
             if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode())) { //交强
                 this.setJqstartdate(riskInfoVo.getStartDate());
@@ -280,7 +226,7 @@ public class InsOrders implements Serializable {
      * @param risks 主险种
      * @param kinds 商业险险种
      */
-    private void productInformation(List<RiskInfoVo> risks, List<KindInfoVo> kinds) {
+    private void productInformation(List<RiskInfoVo> risks, List<KingInfoVo> kinds) {
         /**
          * 投保险种逻辑
          * 单交-单交强
@@ -298,7 +244,7 @@ public class InsOrders implements Serializable {
         ProductsType productsType;
         boolean haveCarDamageKind = false;//是否含车损
         boolean haveBusiKind = false;//是否含车损外的商业险种
-        for (KindInfoVo kindInfoVo : kinds) {
+        for (KingInfoVo kindInfoVo : kinds) {
             String code = kindInfoVo.getKindCode();
             // 车损
             if ("A".equalsIgnoreCase(code)) {

src/main/java/com/ydtech/modules/order/entity/InsOrdersTrack.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -103,7 +104,7 @@ public class InsOrdersTrack implements Serializable {
         this.createTime = LocalDateTime.now();
     }
 
-    public InsOrdersTrack(InsOrders insOrders, String operatorId, String operator) {
+    public InsOrdersTrack(InsOrdersBo insOrders, String operatorId, String operator) {
         this.orderNo = insOrders.getOrderno();
         this.orderStatus = "订单生成";
         this.operatorId = operatorId;

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/QuotationRequest.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.api.bohai.constants.Coverages;
@@ -55,7 +55,7 @@ public class QuotationRequest extends BoHaiBaseRequest {
 
     public QuotationRequest(BoHaiConfigureParameters parameters,
                             List<RiskInfoVo> riskList,
-                            List<KindInfoVo> kindList,
+                            List<KingInfoVo> kindList,
                             String currentValue,
                             String orderNO,
                             CarInfoVo carInfo,
@@ -150,7 +150,7 @@ public class QuotationRequest extends BoHaiBaseRequest {
         @JsonProperty("endDate")
         private String endDate;
 
-        public BusinessPolicyDTO(RiskInfoVo riskInfoVo, List<KindInfoVo> kindList, String currentValue, CarInfoVo carInfo) {
+        public BusinessPolicyDTO(RiskInfoVo riskInfoVo, List<KingInfoVo> kindList, String currentValue, CarInfoVo carInfo) {
             this.startDate = riskInfoVo.getStartDate();
             this.endDate = riskInfoVo.getEndDate();
             this.coverages = CoveragesDTO.toCoveragesDTOList(kindList, currentValue, carInfo);
@@ -186,11 +186,11 @@ public class QuotationRequest extends BoHaiBaseRequest {
             @JsonProperty("sumInsurd")
             private String sumInsurd;
 
-            public static List<CoveragesDTO> toCoveragesDTOList(List<KindInfoVo> kindList, String currentValue, CarInfoVo carInfo) {
+            public static List<CoveragesDTO> toCoveragesDTOList(List<KingInfoVo> kindList, String currentValue, CarInfoVo carInfo) {
                 return kindList.stream().map(x -> toCoveragesDTO(x, currentValue, carInfo)).collect(Collectors.toList());
             }
 
-            private static CoveragesDTO toCoveragesDTO(KindInfoVo kindInfoVo, String currentValue, CarInfoVo carInfo) {
+            private static CoveragesDTO toCoveragesDTO(KingInfoVo kindInfoVo, String currentValue, CarInfoVo carInfo) {
                 String kindCode = kindInfoVo.getKindCode();
                 Coverages coverages = Coverages.valueOf("C_" + kindInfoVo.getKindCode());
                 CoveragesDTO coveragesDTO = new CoveragesDTO();

src/main/java/com/ydtech/modules/order/entity/api/dajia/DaJiaReqRedis.java

@@ -0,0 +1,20 @@
+package com.ydtech.modules.order.entity.api.dajia;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.modules.order.entity.api.dajia.request.ODR1010Request;
+import com.ydtech.modules.order.entity.api.dajia.response.ODR1009Response;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DaJiaReqRedis {
+    @JsonProperty("busiId")
+    private String busiId;
+
+    @JsonProperty("jqSpecialEngageList")
+    private List<ODR1010Request.BodyDTO.JqSpecialEngageListDTO> jqSpecialEngageList;
+
+    @JsonProperty("sySpecialEngageList")
+    private List<ODR1009Response.ResultDTO.SySpecialEngageListDTO> sySpecialEngageList;
+}

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1009Request.java

@@ -1,34 +1,22 @@
 package com.ydtech.modules.order.entity.api.dajia.request;
 
-import cn.hutool.core.date.DateTime;
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.InsuranceRisk;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.ins.model.vo.QuoteInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
 import com.ydtech.modules.order.entity.api.dajia.constants.*;
-import com.ydtech.modules.order.entity.api.dajia.response.ODR1009Response;
 import com.ydtech.modules.order.entity.api.dajia.response.ODR1016Response;
-import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingSubDajia;
-import com.ydtech.utils.DateTimeUtil;
-import com.ydtech.utils.DateTimeUtils;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.*;
-import java.util.stream.Stream;
 
-import static com.ydtech.modules.order.entity.api.dajia.constants.CInspectRec.INSREC1;
 import static com.ydtech.modules.order.entity.api.dajia.constants.CPayTaxType.T5002;
 
 
@@ -48,7 +36,7 @@ public class ODR1009Request extends DaJiaBaseRequest {
     @JsonProperty("body")
     private BodyDTO body;
 
-    public ODR1009Request(String orderNo, List<KindInfoVo> kindInfoVos, List<RiskInfoVo> riskInfoVos, BaseQuoteInfoVo quoteInfoVo, ODR1016Response odr1016Response, InsAccidentalDrivingDajia insAccidentalDrivingDajia, List<InsAccidentalDrivingSubDajia> insAccidentalDrivingSubDajias,DaJiaConfigureParameters daJiaConfigureParameters, boolean isEnergy) {
+    public ODR1009Request(String orderNo, List<KingInfoVo> kindInfoVos, List<RiskInfoVo> riskInfoVos, BaseQuoteInfoVo quoteInfoVo, ODR1016Response odr1016Response, InsAccidentalDrivingDajia insAccidentalDrivingDajia, List<InsAccidentalDrivingSubDajia> insAccidentalDrivingSubDajias, DaJiaConfigureParameters daJiaConfigureParameters, boolean isEnergy) {
         super(daJiaConfigureParameters.getChannelCode(), ServiceCode.ODR1009.getCode());
         if(Objects.isNull(body)){
             body = new BodyDTO();
@@ -168,7 +156,7 @@ public class ODR1009Request extends DaJiaBaseRequest {
         }
         this.body.specialInfo = specialInfoDTO;
     }
-    private CIndemLmtLvl getCPayTaxType(KindInfoVo kindInfoVo){
+    private CIndemLmtLvl getCPayTaxType(KingInfoVo kindInfoVo){
         CIndemLmtLvl[] values = CIndemLmtLvl.values();
         for(CIndemLmtLvl item : values){
             if(item.getAmount().equals(kindInfoVo.getAmount())){
@@ -188,7 +176,7 @@ public class ODR1009Request extends DaJiaBaseRequest {
         return null;
     }
 
-    private CvrgCIndemLmtLvl getCvrgCIndemLmtLvl(KindInfoVo kindInfoVo){
+    private CvrgCIndemLmtLvl getCvrgCIndemLmtLvl(KingInfoVo kindInfoVo){
         CvrgCIndemLmtLvl[] values = CvrgCIndemLmtLvl.values();
         for(CvrgCIndemLmtLvl item : values){
             if(item.getAmount() == (int)(kindInfoVo.getAmount())){
@@ -199,7 +187,7 @@ public class ODR1009Request extends DaJiaBaseRequest {
     }
 
     //商业险别信息（列表）
-    public void setCoverageList(List<KindInfoVo> kindInfoVos,BaseQuoteInfoVo quoteInfoVo,ODR1016Response odr1016Response,boolean isEnergy){
+    public void setCoverageList(List<KingInfoVo> kindInfoVos, BaseQuoteInfoVo quoteInfoVo, ODR1016Response odr1016Response, boolean isEnergy){
         ArrayList<BodyDTO.coverageListDTO> coverageListDTOS = new ArrayList<>();
         Integer seatCount = Integer.parseInt(quoteInfoVo.getCarInfo().getSeatCount());
 

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1010Request.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
+import com.ydtech.modules.order.entity.api.dajia.DaJiaReqRedis;
 import com.ydtech.modules.order.entity.api.dajia.constants.CChannelSrc;
 import com.ydtech.modules.order.entity.api.dajia.constants.ServiceCode;
 import com.ydtech.modules.order.entity.api.dajia.response.NVHLODR1001Response;
@@ -37,7 +38,7 @@ public class ODR1010Request extends DaJiaBaseRequest {
     private BodyDTO body;
 
     public ODR1010Request(String orderNo, String busiId, DaJiaConfigureParameters daJiaConfigureParameters,
-                          ODR1009Response.ResultDTO odr1009Response, InsOrdersBo insOrders) {
+                          DaJiaReqRedis odr1009Response, InsOrdersBo insOrders) {
         super(daJiaConfigureParameters.getChannelCode(), ServiceCode.ODR1010.getCode());
         if(body == null){
             body = new BodyDTO();

src/main/java/com/ydtech/modules/order/entity/api/dajia/response/ODR1009Response.java

@@ -23,6 +23,8 @@ public class ODR1009Response extends DaJiaBaseResponse {
     @NoArgsConstructor
     @Data
     public static class ResultDTO {
+        @JsonProperty("busiId")
+        private String busiId;
         @JsonProperty("jqAppStatus")
         private Object jqAppStatus;
         @JsonProperty("jqAppStatusMessage")

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiQuotedPriceRequest.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseRequest;
@@ -94,7 +94,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
                                HuaTaiConfigureParameters huaTaiConfigureParameters) {
             CarInfoVo carInfo = baseQuoteInfoVo.getCarInfo();
             List<RiskInfoVo> riskList = baseQuoteInfoVo.getRiskList();
-            List<KindInfoVo> kindList = baseQuoteInfoVo.getKindList();
+            List<KingInfoVo> kindList = baseQuoteInfoVo.getKingList();
             VehicleAndVesselTax vesselTax = baseQuoteInfoVo.getVehicleAndVesselTax();
             CustomerInfoVo ownerInfo = baseQuoteInfoVo.getOwnerInfo();
             CustomerInfoVo policyHolderInfo = baseQuoteInfoVo.getPolicyHolderInfo();
@@ -420,7 +420,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
         @JSONField(name = "ChargingPost")
         private List<ChargingPostDto> chargingPost;
 
-        public List<ContractDto> getContract(List<RiskInfoVo> riskInfoVos, List<KindInfoVo> kindInfoVos, Integer quantity,
+        public List<ContractDto> getContract(List<RiskInfoVo> riskInfoVos, List<KingInfoVo> kindInfoVos, Integer quantity,
                                              VehicleAndVesselTax vesselTax, HuaTaiActualValueResponse actualValueResponse,
                                              HuaTaiConfigureParameters huaTaiConfigureParameters,
                                              HuaTaiModelsQueryResponse.CarModelDto.FullCarDataDto fullCarDataDto) {
@@ -536,10 +536,10 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
              * @param quantity    乘客数
              * @return
              */
-            public List<CoverageDto> getBusiness(List<KindInfoVo> kindInfoVos, int quantity, ContractMainDto contractMain,
+            public List<CoverageDto> getBusiness(List<KingInfoVo> kindInfoVos, int quantity, ContractMainDto contractMain,
                                                  HuaTaiActualValueResponse actualValueResponse) {
                 List<CoverageDto> list = new ArrayList<>();
-                for (KindInfoVo kindInfoVo : kindInfoVos) {
+                for (KingInfoVo kindInfoVo : kindInfoVos) {
                     CoverageDto coverageDto = new CoverageDto();
                     String code = kindInfoVo.getKindCode();
                     int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getJinZhangGuiType(), code);

src/main/java/com/ydtech/modules/order/entity/api/zhongmei/request/QuotedPriceRequest.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.api.zhongmei.BaseRequest;
@@ -97,7 +97,7 @@ public class QuotedPriceRequest extends BaseRequest {
                                AccidentalDrivingVo accidentalDrivingVo, ZmConfigureParameters zmConfigureParameters) {
             CarInfoVo carInfo = baseQuoteInfoVo.getCarInfo();
             List<RiskInfoVo> riskList = baseQuoteInfoVo.getRiskList();
-            List<KindInfoVo> kindList = baseQuoteInfoVo.getKindList();
+            List<KingInfoVo> kindList = baseQuoteInfoVo.getKingList();
             CustomerInfoVo ownerInfo = baseQuoteInfoVo.getOwnerInfo();
             CustomerInfoVo policyHolderInfo = baseQuoteInfoVo.getPolicyHolderInfo();
             CustomerInfoVo insuredPersonInfo = baseQuoteInfoVo.getInsuredPersonInfo();
@@ -293,7 +293,7 @@ public class QuotedPriceRequest extends BaseRequest {
         @JsonProperty("coverage")
         private List<CoverageDTO> coverage;
 
-        public List<ContractDTO> getContract(List<RiskInfoVo> riskInfoVos, List<KindInfoVo> kindInfoVos, Integer quantity,
+        public List<ContractDTO> getContract(List<RiskInfoVo> riskInfoVos, List<KingInfoVo> kindInfoVos, Integer quantity,
                                              String energyTypes) {
             List<ContractDTO> contractDTOS = new ArrayList<>();
             for (RiskInfoVo riskInfoVo : riskInfoVos) {
@@ -388,9 +388,9 @@ public class QuotedPriceRequest extends BaseRequest {
              * @param quantity    乘客数
              * @return
              */
-            public List<CoverageDTO> getBusiness(List<KindInfoVo> kindInfoVos, int quantity) {
+            public List<CoverageDTO> getBusiness(List<KingInfoVo> kindInfoVos, int quantity) {
                 List<CoverageDTO> list = new ArrayList<>();
-                for (KindInfoVo kindInfoVo : kindInfoVos) {
+                for (KingInfoVo kindInfoVo : kindInfoVos) {
                     CoverageDTO coverageDTO = new CoverageDTO();
                     String code = kindInfoVo.getKindCode();
                     int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getJinZhangGuiType(), code);

src/main/java/com/ydtech/modules/order/entity/api/zijin/request/CalculatePremiumRequest.java

@@ -8,7 +8,7 @@ import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.insurance.VehicleType;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.api.zhongmei.constants.TimeConstants;
@@ -132,7 +132,7 @@ public class CalculatePremiumRequest implements Serializable {
         // 投被保人信息
         this.insuredList = InsuredListDTO.toInsuredListDTOList(quoteInfoVo.getPolicyHolderInfo(), quoteInfoVo.getInsuredPersonInfo());
         // 险别信息
-        this.itemKindList = ItemKindListDTO.toItemKindListDTOList(actualValue, quoteInfoVo.getKindList(),
+        this.itemKindList = ItemKindListDTO.toItemKindListDTOList(actualValue, quoteInfoVo.getKingList(),
                 Integer.parseInt(quoteInfoVo.getCarInfo().getSeatCount()) - 1, quoteInfoVo.getCarInfo().isNewEnergy());
         // 浮动因子信息
         this.profitDataList = ProfitDataListDTO.toCoefficient(quoteVo.getCoefficient());
@@ -1152,7 +1152,7 @@ public class CalculatePremiumRequest implements Serializable {
             return insuredListDTO;
         }
 
-        public static List<ItemKindListDTO> toItemKindListDTOList(String actualValue, List<KindInfoVo> kindList, int quantity, boolean isEnergy ) {
+        public static List<ItemKindListDTO> toItemKindListDTOList(String actualValue, List<KingInfoVo> kindList, int quantity, boolean isEnergy ) {
             List<ItemKindListDTO> list = new ArrayList<>();
             String[] insuranceType = InsuranceTypeCorrespondence.getZjConnectInsuranceType();
 
@@ -1160,7 +1160,7 @@ public class CalculatePremiumRequest implements Serializable {
                 insuranceType = InsuranceTypeCorrespondence.getZjConnectInsuranceTypeNewEnergy();
             }
 
-            for (KindInfoVo kindInfoVo : kindList) {
+            for (KingInfoVo kindInfoVo : kindList) {
                 String code = kindInfoVo.getKindCode();
                 ItemKindListDTO itemKindListDTO = new ItemKindListDTO();
                 int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getJinZhangGuiType(), code);

src/main/java/com/ydtech/modules/order/entity/bo/InsOrdersBo.java

@@ -1,17 +1,19 @@
 package com.ydtech.modules.order.entity.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.po.*;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
-import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.VehicleAndVesselTax;
 import lombok.AllArgsConstructor;
@@ -22,6 +24,7 @@ import org.springframework.beans.BeanUtils;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Data
 @AllArgsConstructor
@@ -51,11 +54,6 @@ public class InsOrdersBo {
      */
     private String orderstatus;
 
-    /**
-     * 车辆信息
-     */
-    private CarInfoVo carinfo;
-
     /**
      * 用户id
      */
@@ -81,22 +79,6 @@ public class InsOrdersBo {
      */
     private String deptname;
 
-    /**
-     * 车主信息
-     */
-    private CustomerInfoVo ownerinfo;
-
-
-    /**
-     * 投保人信息
-     */
-    private CustomerInfoVo applyinfo;
-
-    /**
-     * 被保人信息
-     */
-    private CustomerInfoVo insureinfo;
-
     /**
      * 协议id
      */
@@ -152,20 +134,48 @@ public class InsOrdersBo {
      */
     private String syenddate;
 
+
+
+    /**
+     * 车辆信息
+     */
+    private InsOrdersCarInfo carinfo;
+
+    /**
+     * 投保人信息
+     */
+    private InsOrdersCarUserInfo applyinfo;
+
+    /**
+     * 车主信息
+     */
+    private InsOrdersCarUserInfo ownerinfo;
+
+    /**
+     * 被保人信息
+     */
+    private InsOrdersCarUserInfo insureinfo;
+
     /**
-     * 商业 交强
+     * 险种信息
      */
-    private List<RiskInfoVo> risk;
+    private List<InsOrdersRisk> risk;
 
     /**
-     * 商业险信息
+     * 商业险种信息
      */
-    private List<KindInfoVo> king;
+    private List<InsOrdersKing> king;
 
     /**
-     * 车船税信息
+     * 欠税信息
      */
-    private VehicleAndVesselTax vehicleAndVesselTax;
+    private InsOrdersTax vehicleAndVesselTax;
+
+    /**
+     * 子集集合
+     */
+    private List<InsAreaCompany> insAreaCompanyList; //子级集合
+
 
 
     public InsOrdersBo(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
@@ -176,34 +186,40 @@ public class InsOrdersBo {
         this.setLicenseno(quoteInfoVo.getCarInfo().getLicenseNo());
 
         // 2.1 车辆信息
-        this.setCarinfo(quoteInfoVo.getCarInfo());
+        this.setCarinfo(quoteInfoVo.getCarInfo().toInsOrdersCarInfo());
         this.setUserid(user.getId());
         this.setUsername(user.getName());
         this.setDeptid(user.getDeptId());
         this.setDeptname(dept == null ? "" : dept.getName());
 
         // 2.2 人员信息
-        this.setOwnerinfo(quoteInfoVo.getOwnerInfo());
-        this.setApplyinfo(quoteInfoVo.getPolicyHolderInfo());
-        this.setInsureinfo(quoteInfoVo.getInsuredPersonInfo());
+        this.setOwnerinfo(quoteInfoVo.getOwnerInfo().toInsOrdersCarUserInfo());
+        this.setApplyinfo(quoteInfoVo.getPolicyHolderInfo().toInsOrdersCarUserInfo());
+        this.setInsureinfo(quoteInfoVo.getInsuredPersonInfo().toInsOrdersCarUserInfo());
         this.setInsuredname(quoteInfoVo.getPolicyHolderInfo().getName());
 
+
         List<RiskInfoVo> risks = quoteInfoVo.getRiskList();
-        List<KindInfoVo> kinds = quoteInfoVo.getKindList();
+        List<KingInfoVo> kinds = quoteInfoVo.getKingList();
 
         // 2.3 主险种信息
         this.insuranceInformation(risks, kinds);
+        List<InsOrdersRisk> insOrdersRisks = new ArrayList<>();
 
         // 2.3.1 险种信息
-        this.setRisk(quoteInfoVo.getRiskList());
-        this.setKing(quoteInfoVo.getKindList());
+        this.setRisk(quoteInfoVo.getRiskList().stream()
+                .map(RiskInfoVo::toInsOrdersRisk)
+                .collect(Collectors.toList()));
+        this.setKing(quoteInfoVo.getKingList().stream()
+                .map(KingInfoVo::toInsOrdersKing)
+                .collect(Collectors.toList()));
 
         // 2.4 产品信息
         this.productInformation(risks, kinds);
         this.setCreatetime(LocalDateTime.now());
 
         // 2.5 车船税信息
-        this.setVehicleAndVesselTax(quoteInfoVo.getVehicleAndVesselTax());
+        this.setVehicleAndVesselTax(quoteInfoVo.getVehicleAndVesselTax().toInsOrdersTax());
     }
 
     /**
@@ -212,7 +228,7 @@ public class InsOrdersBo {
      * @param risks 主险种
      * @param kinds 商业险险种
      */
-    private void insuranceInformation(List<RiskInfoVo> risks, List<KindInfoVo> kinds) {
+    private void insuranceInformation(List<RiskInfoVo> risks, List<KingInfoVo> kinds) {
         for (RiskInfoVo riskInfoVo : risks) {
             if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode())) { //交强
                 this.setJqstartdate(riskInfoVo.getStartDate());
@@ -235,7 +251,7 @@ public class InsOrdersBo {
      * @param risks 主险种
      * @param kinds 商业险险种
      */
-    private void productInformation(List<RiskInfoVo> risks, List<KindInfoVo> kinds) {
+    private void productInformation(List<RiskInfoVo> risks, List<KingInfoVo> kinds) {
         /**
          * 投保险种逻辑
          * 单交-单交强
@@ -253,7 +269,7 @@ public class InsOrdersBo {
         ProductsType productsType;
         boolean haveCarDamageKind = false;//是否含车损
         boolean haveBusiKind = false;//是否含车损外的商业险种
-        for (KindInfoVo kindInfoVo : kinds) {
+        for (KingInfoVo kindInfoVo : kinds) {
             String code = kindInfoVo.getKindCode();
             // 车损
             if ("A".equalsIgnoreCase(code)) {
@@ -278,66 +294,33 @@ public class InsOrdersBo {
         this.setProduct(productsType.getDesc());
     }
 
-    /**
-     * SyscarUserInfo 转换 CustomerInfoVo
-     * @param insOrdersCarUserInfo
-     */
-    private CustomerInfoVo sysCarUserInfoToCustomerInfoVo(InsOrdersCarUserInfo insOrdersCarUserInfo){
-        CustomerInfoVo customerInfoVo = new CustomerInfoVo();
-        BeanUtils.copyProperties(insOrdersCarUserInfo,customerInfoVo);
-        return customerInfoVo;
-    }
 
     //设置车主信息
     public void setCarUserInfo(List<InsOrdersCarUserInfo> carUserInfoList) {
         carUserInfoList.forEach(carUserInfo -> {
             switch(carUserInfo.getUserType()){
                 case 1:
-                    this.setOwnerinfo(sysCarUserInfoToCustomerInfoVo(carUserInfo));
+                    this.setOwnerinfo(carUserInfo);
                     break;
                 case 2:
-                    this.setApplyinfo(sysCarUserInfoToCustomerInfoVo(carUserInfo));
+                    this.setApplyinfo(carUserInfo);
                     break;
                 case 3:
-                    this.setInsureinfo(sysCarUserInfoToCustomerInfoVo(carUserInfo));
+                    this.setInsureinfo(carUserInfo);
                     break;
             }
         });
     }
 
-    //设置车辆信息
-    public void setCarAllInfo(InsOrdersCarInfo insOrdersCarInfo){
-        CarInfoVo carInfoVo = new CarInfoVo();
-        BeanUtils.copyProperties(insOrdersCarInfo,carInfoVo);
-        this.setCarinfo(carInfoVo);
-    }
-
-
-    public void setRiskList(List<InsOrdersRisk> riskList) {
-        List<RiskInfoVo> risks = new ArrayList<>();
-        riskList.forEach(item->{
-            RiskInfoVo riskInfoVo = new RiskInfoVo();
-            BeanUtils.copyProperties(item,riskInfoVo);
-            risks.add(riskInfoVo);
-        });
-        this.setRisk(risks);
-    }
-
-    public void setKindList(List<InsOrdersKind> kindList) {
-        List<KindInfoVo> kinds = new ArrayList<>();
-        kindList.forEach(item->{
-            KindInfoVo kindInfoVo = new KindInfoVo();
-            BeanUtils.copyProperties(item,kindInfoVo);
-            kinds.add(kindInfoVo);
-        });
-        this.setKing(kinds);
-    }
 
-    public void setVehicleAndVesselTaxParamInsOrdersTax(InsOrdersTax insOrdersTax){
-
-        VehicleAndVesselTax tax = new VehicleAndVesselTax();
-        BeanUtils.copyProperties(insOrdersTax,tax);
-        this.vehicleAndVesselTax = tax;
+    /**
+     * 转换insorders
+     * @return
+     */
+    public InsOrders toInsOrders() {
+        InsOrders insOrders = new InsOrders();
+        BeanUtils.copyProperties(this, insOrders);
+        return insOrders;
     }
 
 }

src/main/java/com/ydtech/modules/order/entity/bo/UnderwritingRulesBo.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -154,7 +154,7 @@ public class UnderwritingRulesBo implements Serializable {
         CustomerInfoVo ownerInfo = baseQuoteInfoVo.getOwnerInfo();
         this.setOwnerInfo(ownerInfo);
         // 车险
-        List<KindInfoVo> kindList = baseQuoteInfoVo.getKindList();
+        List<KingInfoVo> kindList = baseQuoteInfoVo.getKingList();
         this.setInsurance(kindList);
     }
 
@@ -212,9 +212,9 @@ public class UnderwritingRulesBo implements Serializable {
 //        this.ownerType = ownerType;
     }
 
-    private void setInsurance(List<KindInfoVo> kindList) {
+    private void setInsurance(List<KingInfoVo> kindList) {
 
-        for (KindInfoVo kindInfoVo : kindList) {
+        for (KingInfoVo kindInfoVo : kindList) {
             if (kindInfoVo.getKindCode().equals(InsurKind.SY_FJ_YBW2.getCode())) {
                 this.medicalPassenger = (int) kindInfoVo.getAmount();
             } else if (kindInfoVo.getKindCode().equals(InsurKind.SY_FJ_YBW3.getCode())) {

src/main/java/com/ydtech/modules/order/entity/po/InsOrdersCarInfo.java

@@ -411,4 +411,9 @@ public class InsOrdersCarInfo implements Serializable {
         BeanUtils.copyProperties(carInfoVo,this);
     }
 
+    public CarInfoVo toCarInfoVo(){
+        CarInfoVo carInfoVo = new CarInfoVo();
+        BeanUtils.copyProperties(this,carInfoVo);
+        return carInfoVo;
+    }
 }

src/main/java/com/ydtech/modules/order/entity/po/InsOrdersCarUserInfo.java

@@ -122,4 +122,10 @@ public class InsOrdersCarUserInfo implements Serializable {
     public void copyProperties(CustomerInfoVo customerInfoVo){
         BeanUtils.copyProperties(customerInfoVo,this);
     }
+
+    public CustomerInfoVo toCustomerInfoVo(){
+        CustomerInfoVo customerInfoVo = new CustomerInfoVo();
+        BeanUtils.copyProperties(this,customerInfoVo);
+        return customerInfoVo;
+    }
 }

src/main/java/com/ydtech/modules/order/entity/po/InsOrdersKind.java → src/main/java/com/ydtech/modules/order/entity/po/InsOrdersKing.java

@@ -1,10 +1,9 @@
 package com.ydtech.modules.order.entity.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -18,7 +17,7 @@ import java.util.stream.Collectors;
  */
 @TableName(value = "ins_orders_kind")
 @Data
-public class InsOrdersKind implements Serializable {
+public class InsOrdersKing implements Serializable {
     /**
      * id
      */
@@ -67,11 +66,11 @@ public class InsOrdersKind implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
-    public InsOrdersKind(){
+    public InsOrdersKing(){
 
     }
 
-    public InsOrdersKind(KindInfoVo kindInfoVo, String orderNo) {
+    public InsOrdersKing(KingInfoVo kindInfoVo, String orderNo) {
         this.orderNo = orderNo;
         this.amount = kindInfoVo.getAmount();
         this.unitAmount = kindInfoVo.getUnitAmount();
@@ -80,12 +79,12 @@ public class InsOrdersKind implements Serializable {
         this.deductibleRate = kindInfoVo.getDeductibleRate();
     }
 
-    public static List<InsOrdersKind> buildKindList(String orderNo, List<KindInfoVo> risk) {
-        return risk.stream().map(x -> new InsOrdersKind(x, orderNo)).collect(Collectors.toList());
+    public static List<InsOrdersKing> buildKindList(String orderNo, List<KingInfoVo> risk) {
+        return risk.stream().map(x -> new InsOrdersKing(x, orderNo)).collect(Collectors.toList());
     }
 
-    public KindInfoVo toKindInfoVo() {
-        KindInfoVo kindInfoVo = new KindInfoVo();
+    public KingInfoVo toKingInfoVo() {
+        KingInfoVo kindInfoVo = new KingInfoVo();
         kindInfoVo.setAmount(this.amount);
         kindInfoVo.setUnitAmount(this.unitAmount);
         kindInfoVo.setKindCode(this.kindCode);

src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteInfoVo.java

@@ -31,7 +31,7 @@ public class BaseQuoteInfoVo extends YaQuoteInfoVo {
     public BaseQuoteInfoVo(InsOrdersBo insOrders) {
         super(insOrders);
         this.orderNo = insOrders.getOrderno();
-        this.vehicleAndVesselTax = insOrders.getVehicleAndVesselTax();
+        this.vehicleAndVesselTax = insOrders.getVehicleAndVesselTax().toVehicleAndVesselTax();
     }
 
 }

src/main/java/com/ydtech/modules/order/entity/vo/InsOrdersEditingVo.java

@@ -7,6 +7,7 @@ import com.ydtech.modules.ins.model.vo.QuoteKindRespVo;
 import com.ydtech.modules.ins.model.vo.QuoteRiskRespVo;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
+import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class InsOrdersEditingVo extends InsOrders implements Serializable {
+public class InsOrdersEditingVo extends InsOrdersBo implements Serializable {
 
     private static final long serialVersionUID = 8245987503764357200L;
 

src/main/java/com/ydtech/modules/order/entity/vo/VehicleAndVesselTax.java

@@ -1,8 +1,11 @@
 package com.ydtech.modules.order.entity.vo;
 
+import com.ydtech.modules.order.entity.InsAreaCompanyTaxArrears;
+import com.ydtech.modules.order.entity.po.InsOrdersTax;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 
@@ -48,4 +51,16 @@ public class VehicleAndVesselTax implements Serializable {
     @ApiModelProperty("车船税标志 1-正常交税； 2-免税； 3-减税； 4-完税")
     private String taxRelifFlag;
 
+    public InsOrdersTax toInsOrdersTax(){
+        InsOrdersTax insOrdersTax = new InsOrdersTax();
+        BeanUtils.copyProperties(this,insOrdersTax);
+        return insOrdersTax;
+    }
+
+    public InsAreaCompanyTaxArrears toInsAreaCompanyTaxArrears(){
+        InsAreaCompanyTaxArrears insAreaCompanyTaxArrears = new InsAreaCompanyTaxArrears();
+        BeanUtils.copyProperties(this,insAreaCompanyTaxArrears);
+        return insAreaCompanyTaxArrears;
+    }
+
 }

src/main/java/com/ydtech/modules/order/service/InsOrdersCarInfoService.java

@@ -24,6 +24,13 @@ public interface InsOrdersCarInfoService extends IService<InsOrdersCarInfo> {
      */
     InsOrdersCarInfo getCarInfoById(String id);
 
+    /**
+     * 根据订单号更新车辆信息
+     * @param insOrdersCarInfo
+     * @return
+     */
+    boolean updateByOrderNo(InsOrdersCarInfo insOrdersCarInfo);
+
 }
 
 

src/main/java/com/ydtech/modules/order/service/InsOrdersKindService.java → src/main/java/com/ydtech/modules/order/service/InsOrdersKingService.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.order.entity.po.InsOrdersKind;
+import com.ydtech.modules.order.entity.po.InsOrdersKing;
 
 import java.util.List;
 
@@ -10,6 +10,6 @@ import java.util.List;
 * @description 针对表【ins_orders_kind(大订单（商业险险种信息）)】的数据库操作Service
 * @createDate 2024-03-05 15:06:04
 */
-public interface InsOrdersKindService extends IService<InsOrdersKind> {
-    List<InsOrdersKind> queryByOrderNo(String orderNo);
+public interface InsOrdersKingService extends IService<InsOrdersKing> {
+    List<InsOrdersKing> queryByOrderNo(String orderNo);
 }

src/main/java/com/ydtech/modules/order/service/InsOrdersService.java

@@ -50,7 +50,7 @@ public interface InsOrdersService extends IService<InsOrders> {
      *
      * @param orderNo
      */
-    InsOrders existOrder(String orderNo);
+    InsOrdersBo existOrder(String orderNo);
 
     /**
      * 生成订单
@@ -114,7 +114,14 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @param insOrders 订单数据
      * @return true->成功 false->失败
      */
-    boolean saveAndTrajectories(InsOrders insOrders);
+    boolean saveAndTrajectories(InsOrdersBo insOrders);
+
+    /**
+     * 更新订单数据
+     * @param insOrders
+     * @return
+     */
+    boolean updateInsOrders(InsOrdersBo insOrders);
 
 
     /**

src/main/java/com/ydtech/modules/order/service/impl/BoHaiOrderApiServiceImpl.java

@@ -6,6 +6,7 @@ import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.admin.service.SysAreaService;
@@ -149,7 +150,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         // 车辆实际价值
         String currentValue = vehicleConfirmationResponse.getData().getVehicleModels().get(0).getCurrentValue();
         // 4. 报价接口
-        QuotationRequest quotationRequest = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKindList(),
+        QuotationRequest quotationRequest = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKingList(),
                 currentValue, orderNo, carInfo, quoteVo.getAccidentalDrivingVo());
         QuotationResponse response = boHaiRequestApiComponent.quotation(quotationRequest, parameters.getSysSourceCode());
         //商业险重复投保  重复投保保单信息 :保单号:314042303060007485车牌号:晋A881SR车架号:LMGAC1381K1535834发动机号:F699317保险公司代码:YAIC签单日期:20230414起保日期:202305030000
@@ -224,7 +225,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         if (ResponseCode.R_Z00001.getCode().equals(vehicleCheckCodeResponse.getResponseCode())) {
             String checkCode = vehicleCheckCodeResponse.getData().getCheckCode();
             //重新报价
-            QuotationRequest quotationRequestNew = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKindList(),
+            QuotationRequest quotationRequestNew = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKingList(),
                     currentValue, orderNo, carInfo, quoteVo.getAccidentalDrivingVo());
             List<QuotationRequest.CheckInfoDTO> checkInfoList = new ArrayList<QuotationRequest.CheckInfoDTO>();
             QuotationRequest.CheckInfoDTO checkInfo = new QuotationRequest.CheckInfoDTO("2", checkCode, "N");
@@ -390,7 +391,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
     @Override
     public HttpResult<CrawlerPolicyPrintVo> getPolicyPrint(String subOrderNo) throws Exception {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
-        InsOrders insOrders = insOrdersService.existOrder(insAreaCompany.getOrderno());
+        InsOrdersBo insOrders = insOrdersService.existOrder(insAreaCompany.getOrderno());
         InsOrdersCarUserInfo customerInfoVo = insOrders.getApplyinfo();
 
         // 账号信息
@@ -595,8 +596,8 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             List<QuotationResponse.DataDTO.BusinessPolicyDTO.CoveragesDTO> coverages = businessPolicy.getCoverages();
             // 商业险险种
             QuoteKindRespVo kind;
-            List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-            for (KindInfoVo kindInfoVo : kindList) {
+            List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+            for (KingInfoVo kindInfoVo : kindList) {
                 kind = new QuoteKindRespVo();
                 kind.setKindCode(kindInfoVo.getKindCode());
                 kind.setKindName(kindInfoVo.getKindName());

src/main/java/com/ydtech/modules/order/service/impl/DaJiaOrderServiceImpl.java

@@ -8,13 +8,13 @@ import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.order.entity.api.dajia.DaJiaReqRedis;
 import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.admin.service.SysAreaService;
 import com.ydtech.modules.order.service.InsOrdersCarInfoService;
 import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
-import com.ydtech.modules.fnc.entity.InsFeeAudit;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
 import com.ydtech.modules.fnc.service.InsPlyIncomeService;
 import com.ydtech.modules.ins.model.vo.*;
@@ -44,23 +44,23 @@ import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
-import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
-import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.DateTimeUtil;
 import com.ydtech.utils.baidu.FileUtil;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.cache.RedisCache;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.ydtech.modules.order.components.dajia.DaJiaRequestApiComponents.daJiaReqRedisKey;
 import static com.ydtech.modules.order.components.gouren.GuorenDuplicateInsuranceComponent.*;
 
 
@@ -109,6 +109,9 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
     @Autowired
     private InsPlyIncomeService insPlyIncomeService;
 
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
     @Value("${upload.file.path}")
     private String uploadFilePath;
 
@@ -229,7 +232,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             }
 
             //5.保费计算接口
-            List<KindInfoVo> kindList = quoteInfoVo.getKindList();
+            List<KingInfoVo> kindList = quoteInfoVo.getKingList();
             List<RiskInfoVo> riskList = quoteInfoVo.getRiskList();
             //非车险
             JSONObject accidentalDrivingVo = JSONObject.parseObject(JSONObject.toJSONString(t.getAccidentalDrivingVo()));
@@ -338,7 +341,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
      * @return
      * @throws Exception
      */
-    public ODR1009Response quotation(String orderNo, List<KindInfoVo> kindInfoVos, List<RiskInfoVo> riskInfoVos,
+    public ODR1009Response quotation(String orderNo, List<KingInfoVo> kindInfoVos, List<RiskInfoVo> riskInfoVos,
                                      BaseQuoteInfoVo quoteInfoVo, ODR1016Response odr1016Response,
                                      InsAccidentalDrivingDajia insAccidentalDrivingDajia,
                                      List<InsAccidentalDrivingSubDajia> insAccidentalDrivingSubDajias,
@@ -394,7 +397,14 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
         insAreaCompany.setId(companyId);
         insAreaCompany.setOrderno(quoteInfoVo.getOrderNo());
         JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(odr1009Response.getResult()));
-        jsonObject.put("busiId", busiId);
+
+        //保存busiId  核保接口需要使用
+        DaJiaReqRedis daJiaReqRedis = new DaJiaReqRedis();
+        daJiaReqRedis.setBusiId(busiId);
+        daJiaReqRedis.setJqSpecialEngageList(odr1009Response.getResult().getJqSpecialEngageList());
+        daJiaReqRedis.setSySpecialEngageList(odr1009Response.getResult().getSySpecialEngageList());
+        redisTemplate.opsForValue().set(daJiaReqRedisKey+companyId,JSONObject.toJSONString(daJiaReqRedis));
+
 //        insAreaCompany.setReptxt(jsonObject);
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
         insAreaCompany.setInsOrderNo(orderId);
@@ -591,10 +601,9 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             //获取公司配置信息
             DaJiaConfigureParameters daJiaConfigureParameters = new DaJiaConfigureParameters();
             configureParametersComponents.toEntity(daJiaConfigureParameters, insAreaCompany.getAgreementId());
-
+            String repTxt = redisTemplate.opsForValue().get(daJiaReqRedisKey + companyId);
             //1009返回数据
-            ODR1009Response.ResultDTO resultDTO = JSONObject.parseObject(JSON.toJSONString(insAreaCompany.getReptxt()),
-                    ODR1009Response.ResultDTO.class);
+            DaJiaReqRedis resultDTO = JSONObject.parseObject(JSON.toJSONString(repTxt), DaJiaReqRedis.class);
 
             //驾意险 返回数据
             List<NVHLODR1001Response.policyInfosDTO> policyInfosDTOS = null;
@@ -604,8 +613,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             }
 
             //核保构造request
-            ODR1010Request odr1010Request = new ODR1010Request(insAreaCompany.getInsOrderNo(), insAreaCompany.getReptxt().getString(
-                    "busiId"), daJiaConfigureParameters, resultDTO, insOrders);
+            ODR1010Request odr1010Request = new ODR1010Request(insAreaCompany.getInsOrderNo(), resultDTO.getBusiId(), daJiaConfigureParameters, resultDTO, insOrders);
             ODR1010Response odr1010Response = daJiaRequestApiComponents.underwriting(odr1010Request);
             if (odr1010Response.getStatus().equals(Message.M0000.getCode())) {
                 if ("0".equals(odr1010Response.getResult().getJqAppStatus()) || "0".equals(odr1010Response.getResult().getSyAppStatus())) {
@@ -846,7 +854,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             String templateName = "";
             String url = "";
             InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(policyPrintVo.getCompanyId());
-            InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+//            InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+            InsOrdersBo insOrders = insOrdersService.queryInsOrders(insAreaCompany.getOrderno());
             //获取公司配置信息
             DaJiaConfigureParameters daJiaConfigureParameters = new DaJiaConfigureParameters();
             configureParametersComponents.toEntity(daJiaConfigureParameters, insAreaCompany.getAgreementId());

src/main/java/com/ydtech/modules/order/service/impl/HuaTaiOrderApiServiceImpl.java

@@ -17,6 +17,7 @@ import com.ydtech.modules.order.components.huatai.HuaTaiRequestApiComponents;
 import com.ydtech.modules.order.components.huatai.HuiTaiUploadImageComponents;
 import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsAreaCompanyRisk;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseRequestHead;
@@ -30,6 +31,7 @@ import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
 import com.ydtech.modules.order.entity.filter.CarModelsFilterUtils;
 import com.ydtech.modules.order.entity.po.InsHuataiContributing;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.entity.vo.huatai.InsHuataiContributingVo;
 import com.ydtech.modules.order.service.*;
@@ -282,15 +284,15 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
 
     @Override
     public HttpResult<List<InsHuataiContributing>> queryClauseData(String companyId) {
-        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
-        insAreaCompanyService.getByInsOrderNo()
+//        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(companyId);
 //        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
         InsOrdersBo insOrders = insOrdersService.queryInsOrders(insAreaCompany.getOrderno());
-        CustomerInfoVo ownerinfo = insOrders.getOwnerinfo();
-        CustomerInfoVo applyinfo = insOrders.getApplyinfo();
+        InsOrdersCarUserInfo ownerinfo = insOrders.getOwnerinfo();
+        InsOrdersCarUserInfo applyinfo = insOrders.getApplyinfo();
 
         List<String> collect =
-                insAreaCompany.getRiskinfo().toJavaList(RiskInfoVo.class).stream().map(RiskInfoVo::getRiskCode).collect(Collectors.toList());
+                insAreaCompany.getRisk().stream().map(InsAreaCompanyRisk::getRiskCode).collect(Collectors.toList());
         List<InsHuataiContributing> list =
                 insHuataiContributingService.lambdaQuery().in(InsHuataiContributing::getRiskCode, collect).list();
 
@@ -539,8 +541,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();
         QuoteKindRespVo kind;
         if (!ObjectUtils.isEmpty(syCoverageDtoList)) {
-            List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-            for (KindInfoVo kindInfoVo : kindList) {
+            List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+            for (KingInfoVo kindInfoVo : kindList) {
                 kind = new QuoteKindRespVo();
                 kind.setKindCode(kindInfoVo.getKindCode());
                 kind.setKindName(kindInfoVo.getKindName());

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -62,19 +62,6 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         insAreaCompany.setCarinfo(ordersCarUserInfos);
         return insAreaCompany;
 
-        InsOrders insOrders = baseMapper.selectById(orderNo);
-        if(insOrders == null){
-            return null;
-        }
-        BeanUtils.copyProperties(insOrders,insOrdersBo);
-
-
-
-
-        //获取车辆信息
-        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getCarInfoByOrderNo(orderNo);
-        insOrdersBo.setCarAllInfo(insOrdersCarInfo);
-        return insOrdersBo;
     }
 
     @Override

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -282,8 +282,8 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
 
         QuoteKindRespVo kind;
         Map<String, Double> map = response.getInsuranceType();
-        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-        for (KindInfoVo kindInfoVo : kindList) {
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+        for (KingInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(kindInfoVo.getKindCode());
             kind.setKindName(kindInfoVo.getKindName());

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersCarInfoServiceImpl.java

@@ -53,6 +53,11 @@ public class InsOrdersCarInfoServiceImpl extends ServiceImpl<InsOrdersCarInfoMap
     public InsOrdersCarInfo getCarInfoById(String id) {
         return baseMapper.selectOne(new LambdaQueryWrapper<InsOrdersCarInfo>().eq(InsOrdersCarInfo::getId, id));
     }
+
+    @Override
+    public boolean updateByOrderNo(InsOrdersCarInfo insOrdersCarInfo) {
+        return baseMapper.update(insOrdersCarInfo, new LambdaQueryWrapper<InsOrdersCarInfo>().eq(InsOrdersCarInfo::getOrderNo, insOrdersCarInfo.getOrderNo())) > 0;
+    }
 }
 
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersKindServiceImpl.java → src/main/java/com/ydtech/modules/order/service/impl/InsOrdersKingServiceImpl.java

@@ -2,9 +2,9 @@ package com.ydtech.modules.order.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.order.entity.po.InsOrdersKind;
+import com.ydtech.modules.order.entity.po.InsOrdersKing;
 import com.ydtech.modules.order.dao.InsOrdersKindMapper;
-import com.ydtech.modules.order.service.InsOrdersKindService;
+import com.ydtech.modules.order.service.InsOrdersKingService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -15,12 +15,12 @@ import java.util.List;
 * @createDate 2024-03-05 15:06:04
 */
 @Service
-public class InsOrdersKindServiceImpl extends ServiceImpl<InsOrdersKindMapper, InsOrdersKind>
-    implements InsOrdersKindService{
+public class InsOrdersKingServiceImpl extends ServiceImpl<InsOrdersKindMapper, InsOrdersKing>
+    implements InsOrdersKingService {
 
     @Override
-    public List<InsOrdersKind> queryByOrderNo(String orderNo) {
-        return baseMapper.selectList(new LambdaQueryWrapper<>(InsOrdersKind.class).eq(InsOrdersKind::getOrderNo, orderNo));
+    public List<InsOrdersKing> queryByOrderNo(String orderNo) {
+        return baseMapper.selectList(new LambdaQueryWrapper<>(InsOrdersKing.class).eq(InsOrdersKing::getOrderNo, orderNo));
     }
 }
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -34,9 +34,7 @@ import com.ydtech.modules.fnc.service.InsFeeAuditService;
 import com.ydtech.modules.ins.dao.InsFileMapper;
 import com.ydtech.modules.ins.model.InsOrdersExcel;
 import com.ydtech.modules.ins.model.InsOrdersExcelVo;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.QuoteKindRespVo;
+import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.ExtendInfoDto;
 import com.ydtech.modules.ins.model.ya.ResponseDataC2;
@@ -44,18 +42,15 @@ import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import com.ydtech.modules.order.convert.CarModelDTOConvert;
 import com.ydtech.modules.order.convert.MapToYaExtendInfoDto;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
-import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.InsOrdersTrack;
+import com.ydtech.modules.order.entity.*;
 import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.bo.UnderwritingRulesBo;
 import com.ydtech.modules.order.entity.crawler.response.CrawlerVerifyPaymentResponse;
 import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
-import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
-import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
+import com.ydtech.modules.order.entity.po.*;
 import com.ydtech.modules.order.entity.vo.*;
+import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
 import com.ydtech.modules.order.service.*;
 import com.ydtech.modules.protocol.entity.constants.PtlApiType;
@@ -138,6 +133,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Autowired
     private InsOrdersCarInfoService insOrdersCarInfoService;
 
+    @Autowired
+    private InsOrdersRiskService insOrdersRiskService;
+
+    @Autowired
+    private InsOrdersKingService insOrdersKingService;
+
+    @Autowired
+    private InsOrdersTaxService insOrdersTaxService;
+
 
     public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService,
                                 SysUserRoleService sysUserRoleService,
@@ -210,13 +214,17 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public List<CarModelDTO> vinSearch(String vin) {
-        LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(InsOrders::getCarinfo);
-        wrapper.eq(InsOrders::getFrameno, vin).eq(InsOrders::getOrderstatus,
-                InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()).orderByAsc(InsOrders::getCreatetime).last("limit 1");
-        InsOrders insOrders = baseMapper.selectOne(wrapper);
-        if (!ObjectUtils.isEmpty(insOrders)) {
-            CarInfoVo carInfoVo = JSON.parseObject(JSONObject.toJSONString(insOrders.getCarinfo()), CarInfoVo.class);
+        LambdaQueryWrapper<InsOrdersCarInfo> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.select(InsOrdersBo::getCarinfo);
+//        wrapper.eq(InsOrdersCarInfo::getFrameno, vin).eq(InsOrdersBo::getOrderstatus,
+//                InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()).orderByAsc(InsOrdersBo::getCreatetime).last("limit 1");
+        wrapper.inSql(InsOrdersCarInfo::getOrderNo, "select orderno from ins_orders where orderstatus = 3 orderByAsc createtime limit 1");
+        wrapper.eq(InsOrdersCarInfo::getFrameNo, vin);
+
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getOne(wrapper);
+        if (!ObjectUtils.isEmpty(insOrdersCarInfo)) {
+//            CarInfoVo carInfoVo = JSON.parseObject(JSONObject.toJSONString(insOrders.getCarinfo()), CarInfoVo.class);
+            CarInfoVo carInfoVo = insOrdersCarInfo.toCarInfoVo();
             CarModelDTO carModelDTO = CarModelDTOConvert.INSTANCE.CarInfoVotoCarModelDTO(carInfoVo);
             return Collections.singletonList(carModelDTO);
         }
@@ -224,12 +232,20 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     }
 
     @Override
-    public InsOrders existOrder(String orderNo) {
+    public InsOrdersBo existOrder(String orderNo) {
         InsOrders insOrders = this.getById(orderNo);
+        InsOrdersBo insOrdersBo = new InsOrdersBo();
+        BeanUtils.copyProperties(insOrders, insOrdersBo);
+
+        insOrdersBo.setCarinfo(insOrdersCarInfoService.getCarInfoByOrderNo(insOrders.getOrderno()));
+        insOrdersBo.setCarUserInfo(insOrdersCarUserInfoService.getCarUserInfoByOrderNo(insOrders.getOrderno()));
+        insOrdersBo.setRisk(insOrdersRiskService.queryByOrderNo(insOrders.getOrderno()));
+        insOrdersBo.setKing(insOrdersKingService.queryByOrderNo(insOrders.getOrderno()));
+
         if (ObjectUtils.isEmpty(insOrders)) {
             throw new SystemException("订单不存在");
         }
-        return insOrders;
+        return insOrdersBo;
     }
 
     /**
@@ -267,14 +283,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         SysUser user = sysUserService.getById(realUserId);
         SysDept dept = sysDeptService.getById(user.getDeptId());
         // 2 构造订单
-        InsOrders insOrders = new InsOrders(user, dept, quoteInfoVo);
+        InsOrdersBo insOrders = new InsOrdersBo(user, dept, quoteInfoVo);
         if (daikeFlag) {//当时代客录单业务时，才需要赋值该字段
             insOrders.setOperatorid(userId);//赋值代客录单操作人为登录人
         }
         if (isCdy) {//赋值出单员  操作人为登录人
             insOrders.setOperatorid(userId);
         }
-        InsOrders insOrders1 = baseMapper.selectById(quoteInfoVo.getOrderNo());
+        InsOrdersBo insOrders1 = this.queryInsOrders(quoteInfoVo.getOrderNo());
 
         //需要赋值代录单人ID
 
@@ -303,7 +319,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         } else {
             // 修改订单
             insOrders.setOrderno(quoteInfoVo.getOrderNo());
-            this.updateById(insOrders);
+            this.updateById(insOrders.toInsOrders());
         }
         // 4 将报价信息存入redis 中
         String s = JSON.toJSONString(quoteInfoVo);
@@ -315,7 +331,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         redisTemplate.opsForValue().set(QUOTE_RULES_KEY + insOrders.getOrderno(), rules, QUOTE_RULES_KEY_TIME,
                 TimeUnit.HOURS);
 
-        return insOrders;
+        return insOrders.toInsOrders();
     }
 
     /**
@@ -698,7 +714,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public InsOrdersEditingVo revise(String orderNo) {
-        InsOrders insOrders = getById(orderNo);
+        InsOrdersBo insOrders = queryInsOrders(orderNo);
         List<InsAreaCompany> insAreaCompanyList =
                 insAreaCompanyService.lambdaQuery().eq(InsAreaCompany::getOrderno, orderNo).orderByDesc(InsAreaCompany::getCreatetime).list();
         insOrders.setInsAreaCompanyList(insAreaCompanyList);
@@ -764,12 +780,56 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     @Transactional
-    public boolean saveAndTrajectories(InsOrders insOrders) {
-        this.baseMapper.insert(insOrders);
+    public boolean saveAndTrajectories(InsOrdersBo insOrders) {
+        // 订单信息
+        final String orderNo = insOrders.getOrderno();
+
+        //1. 车辆信息
+        insOrdersCarInfoService.save(insOrders.getCarinfo());
+
+        // 2 人员信息
+        List<InsOrdersCarUserInfo> carUserInfoList = new ArrayList<>();
+        carUserInfoList.add(insOrders.getOwnerinfo());
+        carUserInfoList.add(insOrders.getApplyinfo());
+        carUserInfoList.add(insOrders.getInsureinfo());
+        insOrdersCarUserInfoService.saveBatch(carUserInfoList);
+
+
+        // 3 车船税信息
+        InsOrdersTax insOrdersTax = insOrders.getVehicleAndVesselTax();
+        insOrdersTaxService.save(insOrdersTax);
+
+        // 4 交强商业信息表
+        List<InsOrdersKing> kingList = insOrders.getKing();
+        insOrdersKingService.saveBatch(kingList);
+
+        // 5 商业险险种信息
+        List<InsOrdersRisk> riskList = insOrders.getRisk();
+        insOrdersRiskService.saveBatch(riskList);
+
         SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
         SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
         final InsOrdersTrack insOrdersTrack = new InsOrdersTrack(insOrders, sysUser.getId(), sysUser.getName());
         insOrdersTrackService.save(insOrdersTrack);
+        this.baseMapper.insert(insOrders.toInsOrders());
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean updateInsOrders(InsOrdersBo insOrders) {
+        // 订单信息
+        final String orderNo = insOrders.getOrderno();
+
+        //1. 车辆信息
+        insOrdersCarInfoService.updateByOrderNo(insOrders.getCarinfo());
+
+        // 2 人员信息
+        List<InsOrdersCarUserInfo> carUserInfoList = new ArrayList<>();
+        carUserInfoList.add(insOrders.getOwnerinfo());
+        carUserInfoList.add(insOrders.getApplyinfo());
+        carUserInfoList.add(insOrders.getInsureinfo());
+        insOrdersCarUserInfoService.updateBatchById(carUserInfoList);
         return true;
     }
 
@@ -874,7 +934,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersBo.setCarUserInfo(ordersCarUserInfos);
         //获取车辆信息
         InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getCarInfoByOrderNo(orderNo);
-        insOrdersBo.setCarAllInfo(insOrdersCarInfo);
+//        insOrdersBo.setCarAllInfo(insOrdersCarInfo);
         return insOrdersBo;
     }
 }

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -16,6 +16,7 @@ import com.ydtech.modules.ins.service.InsTaskHistoryService;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.vo.OrderTaskPoolsVo;
 import com.ydtech.modules.order.entity.vo.TaskForwardingVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
@@ -65,7 +66,7 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
                 .eq(!StringUtils.isEmpty(orderTaskPoolsVo.getOrderStatus()), InsOrders::getOrderstatus, orderTaskPoolsVo.getOrderStatus())
                 .like(!StringUtils.isEmpty(orderTaskPoolsVo.getLicenseNo()), InsOrders::getLicenseno, orderTaskPoolsVo.getLicenseNo())
                 .like(!StringUtils.isEmpty(orderTaskPoolsVo.getFrameNo()), InsOrders::getFrameno, orderTaskPoolsVo.getFrameNo())
-                .like(!StringUtils.isEmpty(orderTaskPoolsVo.getEngineNo()), InsOrders::getCarinfo, orderTaskPoolsVo.getEngineNo())
+//                .like(!StringUtils.isEmpty(orderTaskPoolsVo.getEngineNo()), InsOrders::getCarinfo, orderTaskPoolsVo.getEngineNo())
                 .eq(!StringUtils.isEmpty(orderTaskPoolsVo.getRiskCode()), InsOrders::getProduct, orderTaskPoolsVo.getRiskCode())
                 .eq(!StringUtils.isEmpty(orderTaskPoolsVo.getUserid()), InsOrders::getUserid, orderTaskPoolsVo.getUserid())
                 .eq(!StringUtils.isEmpty(orderTaskPoolsVo.getUsername()), InsOrders::getUsername, orderTaskPoolsVo.getUsername())
@@ -99,7 +100,7 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
     @Transactional
     public HttpResult forwarding(TaskForwardingVo taskForwardingVo) {
         SysUser sysUser = sysUserService.getById(taskForwardingVo.getAuditId());
-        InsOrders insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
+        InsOrdersBo insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
         //插入轨迹表
         InsTaskHistory history = new InsTaskHistory();
         history.setId(String.valueOf(new Date().getTime()));
@@ -115,14 +116,14 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         /*insOrders.setUserid(sysUser.getId());
         insOrders.setUsername(sysUser.getName());*/
         insOrders.setOperatorid(sysUser.getId());
-        insOrdersService.updateById(insOrders);
+        insOrdersService.updateById(insOrders.toInsOrders());
         return HttpResult.ok("保存成功");
     }
     @Override
     @Transactional
     public HttpResult checkCurrentUserEdit(String orderNo){
         String userId = getUserId();
-        InsOrders insOrders = insOrdersService.existOrder(orderNo);
+        InsOrdersBo insOrders = insOrdersService.existOrder(orderNo);
         if(org.apache.commons.lang3.StringUtils.isEmpty(insOrders.getOperatorid())){
             return HttpResult.ok("非代客录单业务，允许编辑");
         }else {
@@ -165,7 +166,7 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
             throw  new SystemException("参数错误，受理人号auditId不能为空！！");
         }
         SysUser sysUserNew = sysUserService.getById(taskForwardingVo.getAuditId());
-        InsOrders insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
+        InsOrdersBo insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(taskForwardingVo.getSubOrderId());
         if(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insAreaCompany.getOrderstatus()) ){
             throw  new SystemException("已承保的订单不能操作！！");
@@ -202,7 +203,7 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         if(StringUtils.isEmpty(taskForwardingVo.getSubOrderId()) ){
             throw  new SystemException("参数错误，子订单号subOrderId不能为空！！");
         }
-        InsOrders insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
+        InsOrdersBo insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(taskForwardingVo.getSubOrderId());
         if(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insAreaCompany.getOrderstatus()) ){
             throw  new SystemException("已承保的订单不能操作！！");

src/main/java/com/ydtech/modules/order/service/impl/PingAnOrderApiServiceImpl.java

@@ -312,7 +312,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
 
         //平安业务id
         String flowid = response.getFlowid();
-        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(response)));
+//        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(response)));
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
         insAreaCompany.setInsOrderNo(flowid);
         Map<String,Object> map=new HashMap<>();
@@ -431,8 +431,8 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
         //通过订单号查询车辆信息和车主信息
         InsOrdersEditingVo insOrders = insOrdersService.revise(subOrderNo);
         //车主信息
-        CustomerInfoVo ownerInfo = insOrders.getOwnerinfo().toJavaObject(CustomerInfoVo.class);
-        CarInfoVo carInfoVo = insOrders.getCarinfo().toJavaObject(CarInfoVo.class);
+        CustomerInfoVo ownerInfo = insOrders.getOwnerinfo().toCustomerInfoVo();
+        CarInfoVo carInfoVo = insOrders.getCarinfo().toCarInfoVo();
         //调用  电子保单pdf  001
         PolicyPdfRequest policyPdfRequest = new PolicyPdfRequest(parameters,quoteVo,ownerInfo.getIdentifyNumber(),carInfoVo.getLicenseNo(),carInfoVo.getFrameNo());
         PolicyPdfResponse policyPdfResponse=null;

src/main/java/com/ydtech/modules/order/service/impl/YongAnOrderServiceImpl.java

@@ -9,6 +9,7 @@ import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.service.InsOrdersCarInfoService;
 import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
@@ -40,6 +41,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -100,6 +102,8 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     @Autowired
     private InsOrdersCarInfoService insOrdersCarInfoService;
 
+    @Autowired
+    private RedisTemplate redisTemplate;
 
 //    @Override
 //    public List<CarModelDTO> vinSearch(String vin) {
@@ -369,6 +373,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         try {
             //1.组装RequestBody
+
             ResponseDataC2 responseDataC2 = JSON.parseObject(insAreaCompany.getReptxt().toJSONString(), ResponseDataC2.class);
             InsOrdersCarUserInfo insureinfo = orders.getInsureinfo();
 
@@ -474,7 +479,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             YaConfigureParameters yaConfigureParameters = configureParametersComponents.toEntity(YaConfigureParameters.class,
                     insAreaCompany.getAgreementId());
 
-            InsOrders insOrders = insOrdersService.existOrder(insAreaCompany.getOrderno());
+            InsOrdersBo insOrders = insOrdersService.existOrder(insAreaCompany.getOrderno());
             // 获取缓存中的影像信息
             List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insOrders.getOrderno(),
                     insAreaCompany.getId());
@@ -783,7 +788,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     }
 
     private KindDTO[] geneKindInfo(YaQuoteInfoVo yaQuoteInfoVo, CarDTO carDTO, boolean jq_falg) {
-        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
         KindDTO[] kindList_n;
         if (jq_falg) {
             kindList_n = new KindDTO[kindList.size() + 1];
@@ -793,7 +798,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
         //商业险险别
         for (int j = 0; j < kindList.size(); j++) {
 
-            KindInfoVo kindInfoVo = kindList.get(j);
+            KingInfoVo kindInfoVo = kindList.get(j);
             String deductibleRate = kindInfoVo.getDeductibleRate();
 
             //第三者责任险
@@ -1177,6 +1182,8 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
             InsOrders insOrder = insOrdersService.getById(quoteInfoVo.getOrderNo());
             //报价成功更新险种信息
+            redisTemplate.opsForValue().set("yongan:quote:" + insOrder.getOrderno(), JSON.toJSONString(quoteRespVo), 30, TimeUnit.MINUTES);
+
             insAreaCompany.setReqtxt(JSON.parseObject(JSON.toJSONString(requestData)));
             insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(responseDataC2)));
             insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(quoteRespVo.getTaxArrears())));

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -16,6 +16,8 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.admin.service.SysAreaService;
+import com.ydtech.modules.ins.model.vo.*;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.service.InsOrdersCarInfoService;
 import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.esm.dao.EsmInsAttachInsureDetailsMapper;
@@ -27,9 +29,6 @@ import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.dto.CarInsDateDto;
 import com.ydtech.modules.ins.model.dto.CarInsPolicyDto;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.yc.CallBackRequest;
 import com.ydtech.modules.ins.model.yc.YcBuildData;
@@ -629,11 +628,11 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         // 获取协议配置信息
         YcConfigureParameters ycConfigureParameters = gainYcConfigParams(iac.getAgreementId());
         //车主
-        CustomerInfoVo ownerInfo = order.getOwnerinfo();
+        InsOrdersCarUserInfo ownerInfo = order.getOwnerinfo();
         //被保人
-        CustomerInfoVo insureInfo = order.getInsureinfo();
+        InsOrdersCarUserInfo insureInfo = order.getInsureinfo();
         //投保人
-        CustomerInfoVo applyInfo = order.getApplyinfo();
+        InsOrdersCarUserInfo applyInfo = order.getApplyinfo();
         //组装参数
         Audit m = Audit.buildAuditParam(order, ycConfigureParameters, iac);
 
@@ -1195,7 +1194,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         //保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany();
         insAreaCompany.setOrderno(insOrder.getOrderno());
-        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(responseData)));
+//        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(responseData)));
         insAreaCompany.setJqpremium(BigDecimal.valueOf(jqFalg ? jqPremium : 0));
         insAreaCompany.setSypremium(BigDecimal.valueOf(syPremium));
         insAreaCompany.setTaxamount(BigDecimal.valueOf(jqFalg ? quoteRespVo.getTaxAmount() : 0));
@@ -1217,15 +1216,15 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         insAreaCompany.setSyEndDate(responseData.getBase().getTInsrncEndTmSY());
 
         if (CollUtil.isEmpty(quoteRespVo.getRiskList())) {
-            insAreaCompany.setRiskinfo(new JSONArray());
+            insAreaCompany.setRisk(new ArrayList<>());
         } else {
-            insAreaCompany.setRiskinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList())));
+            insAreaCompany.setRisk(quoteRespVo.getRiskList().stream().map(QuoteRiskRespVo::toInsAreaCompanyRisk).collect(Collectors.toList()));
         }
 
         if (CollUtil.isEmpty(quoteRespVo.getKindList())) {
-            insAreaCompany.setKindinfo(new JSONArray());
+            insAreaCompany.setKing(new ArrayList<>());
         } else {
-            insAreaCompany.setKindinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList())));
+            insAreaCompany.setKing(quoteRespVo.getKindList().stream().map(QuoteKindRespVo::toInsAreaCompanyKing).collect(Collectors.toList()));
         }
 
         //出险信息

src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderApiServiceImpl.java

@@ -7,6 +7,7 @@ import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
 import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.service.InsOrdersCarInfoService;
 import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
@@ -238,7 +239,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         ZmConfigureParameters zmConfigureParameters = configureParametersComponents.toEntity(ZmConfigureParameters.class,
                 insAreaCompany.getAgreementId());
 
-        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+        InsOrdersBo insOrders = insOrdersService.queryInsOrders(insAreaCompany.getOrderno());
         InsOrdersCarUserInfo customerInfoVo = insOrders.getApplyinfo();
         // 2. 提交核保
         SubmitResponse response = submitForUnderwriting(insAreaCompany.getId(), insOrders.getFrameno(), customerInfoVo,
@@ -413,7 +414,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         // 2. 组装请求体
         InsurancePolicyPrintRequest request = new InsurancePolicyPrintRequest();
         //获取能源种类
-        CarInfoVo carInfoVo = order.getCarinfo();
+        InsOrdersCarInfo carInfoVo = order.getCarinfo();
         if (!InsuranceRisk.ACCIDENT.getCode().equals(riskCode)) {//非车险不传险种代码
             request.setRiskCode(InsuranceTypeCorrespondence.getZhongMei_RISK().get(carInfoVo.getEnergyType()).get(riskCode));
         } else {
@@ -517,8 +518,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         List<QuotedPriceResponse.BizPremiumDTO.CoverageListDTO> coverageList;
         if (!ObjectUtils.isEmpty(quotedPriceResponse.getBizPremium())) {
             coverageList = quotedPriceResponse.getBizPremium().getCoverageList();
-            List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-            for (KindInfoVo kindInfoVo : kindList) {
+            List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+            for (KingInfoVo kindInfoVo : kindList) {
                 kind = new QuoteKindRespVo();
                 kind.setKindCode(kindInfoVo.getKindCode());
                 kind.setKindName(kindInfoVo.getKindName());

src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.order.entity.*;
 import com.ydtech.modules.order.service.InsOrdersCarInfoService;
 import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
 import com.ydtech.modules.admin.service.SysUserService;
@@ -25,9 +26,6 @@ import com.ydtech.modules.ins.model.vo.res.ZmVerifyPaymentVo;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.zm.ZmCarModel;
-import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.request.ZmRequestParameter;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
@@ -279,9 +277,9 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
 
         QuoteKindRespVo kind;
         Map<String, Double> map = response.getKindList();
-        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
 
-        for (KindInfoVo kindInfoVo : kindList) {
+        for (KingInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(kindInfoVo.getKindCode());
             kind.setKindName(kindInfoVo.getKindName());
@@ -319,7 +317,7 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         insAreaCompany.setId(IdGenerate.nextId());
         insAreaCompany.setAttributionId(attributionId);
         insAreaCompany.setOrderno(orderNo);
-        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(response)));
+//        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(response)));
         insAreaCompany.setJqpremium(BigDecimal.valueOf(response.getTrafficStrength()));
         insAreaCompany.setSypremium(BigDecimal.valueOf(response.getBusiness()));
         insAreaCompany.setTaxamount(BigDecimal.valueOf(response.getSumTax()));
@@ -334,8 +332,9 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         }
         insAreaCompany.setSumpremium(BigDecimal.valueOf(add));
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode()); // "1"
-        insAreaCompany.setRiskinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList())));
-        insAreaCompany.setKindinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList())));
+        InsAreaCompanyRisk  risk = new InsAreaCompanyRisk();
+        insAreaCompany.setRisk(InsAreaCompanyRisk.buildQuoteRiskList(orderNo,quoteRespVo.getRiskList()));
+        insAreaCompany.setKing(InsAreaCompanyKing.buildQuoteKingList(orderNo,quoteRespVo.getKindList()));
         insAreaCompany.setJqapplyno(response.getJContractNo());
         insAreaCompany.setSyapplyno(response.getSContractNo());
         insAreaCompany.setCompanyId(esmInsCompanies.getId());

src/main/java/com/ydtech/modules/order/service/impl/ZijinOrderApiServiceImpl.java

@@ -23,9 +23,11 @@ import com.ydtech.modules.order.entity.api.zijin.constants.enums.ResultEnum;
 import com.ydtech.modules.order.entity.api.zijin.constants.enums.RiskCodeEnum;
 import com.ydtech.modules.order.entity.api.zijin.request.*;
 import com.ydtech.modules.order.entity.api.zijin.response.*;
+import com.ydtech.modules.order.entity.bo.InsOrdersBo;
 import com.ydtech.modules.order.entity.config.ZjConfigureParameters;
 import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
 import com.ydtech.modules.order.entity.filter.CarModelsFilterUtils;
+import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
@@ -295,15 +297,15 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             throw new SystemException("此订单还未承包");
         }
 
-        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+        InsOrdersBo insOrders = insOrdersService.queryInsOrders(insAreaCompany.getOrderno());
         // 车牌号
         String licensePlate = insOrders.getLicenseno();
         // 被保人信息
-        JSONObject ownerInfo = insOrders.getInsureinfo();
-        CustomerInfoVo customerInfoVo = ownerInfo.toJavaObject(CustomerInfoVo.class);
+        InsOrdersCarUserInfo ownerInfo = insOrders.getInsureinfo();
+//        CustomerInfoVo customerInfoVo = ownerInfo.toJavaObject(CustomerInfoVo.class);
         String busNo;
         BusType busType;
-        String identifyNo = customerInfoVo.getIdentifyNumber();
+        String identifyNo = ownerInfo.getIdentifyNumber();
         String templateName;
         switch (policyPrintVo.getRiskCode()) {
             case InsuranceRisk.TRAFFIC_CODE:
@@ -507,8 +509,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         List<CalculatePremiumResponse.ItemKindListDTO> itemKindList = calculatePremiumResponse.getItemKindList();
 
         // 商业险险种
-        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-        for (KindInfoVo kindInfoVo : kindList) {
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+        for (KingInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(kindInfoVo.getKindCode());
             kind.setKindName(kindInfoVo.getKindName());
@@ -565,7 +567,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
         // 协议id
         insAreaCompany.setId(orderNo);
-        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(calculatePremiumResponse)));
+//        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(calculatePremiumResponse)));
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
         insAreaCompany.setInsOrderNo(orderId);
         // 车船税

src/main/java/com/ydtech/modules/xxl/handler/SyncCarInfoHandler.java

@@ -3,18 +3,17 @@ package com.ydtech.modules.xxl.handler;
 import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
 import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.service.InsOrdersCarInfoService;
 import com.ydtech.modules.order.service.InsOrdersCarUserInfoService;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
+import com.ydtech.modules.ins.model.vo.KingInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.InsOrdersOld;
-import com.ydtech.modules.order.entity.po.InsOrdersKind;
+import com.ydtech.modules.order.entity.po.InsOrdersKing;
 import com.ydtech.modules.order.entity.po.InsOrdersRisk;
 import com.ydtech.modules.order.entity.po.InsOrdersTax;
 import com.ydtech.modules.order.service.*;
@@ -28,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 
 /**
@@ -48,7 +46,7 @@ public class SyncCarInfoHandler {
     @Autowired
     private InsOrdersRiskService insOrdersRiskService;
     @Autowired
-    private InsOrdersKindService insOrdersKindService;
+    private InsOrdersKingService insOrdersKindService;
     @Autowired
     private InsOrdersOldService insOrdersOldService;
     @Autowired
@@ -100,7 +98,7 @@ public class SyncCarInfoHandler {
                 List<InsOrdersCarUserInfo> insOrdersCarUserInfos = new ArrayList<>();
                 List<InsOrdersCarInfo> insOrdersCarInfos = new ArrayList<>();
                 List<InsOrdersRisk> insOrdersRisks = new ArrayList<>();
-                List<InsOrdersKind> insOrdersKinds = new ArrayList<>();
+                List<InsOrdersKing> insOrdersKings = new ArrayList<>();
                 List<InsOrdersTax> insOrdersTaxes = new ArrayList<>();
                 page.getRecords().forEach(item -> {
 
@@ -174,10 +172,10 @@ public class SyncCarInfoHandler {
                     //kind
                     for (int i = 0; i < kind.size(); i++) {
                         JSONObject jsonObject = kind.getJSONObject(i);
-                        KindInfoVo javaObject = jsonObject.toJavaObject(KindInfoVo.class);
-                        InsOrdersKind insOrdersKind = new InsOrdersKind(javaObject, insOrders.getOrderno());
-                        insOrdersKind.setId(IdGenerate.nextId());
-                        insOrdersKinds.add(insOrdersKind);
+                        KingInfoVo javaObject = jsonObject.toJavaObject(KingInfoVo.class);
+                        InsOrdersKing insOrdersKing = new InsOrdersKing(javaObject, insOrders.getOrderno());
+                        insOrdersKing.setId(IdGenerate.nextId());
+                        insOrdersKings.add(insOrdersKing);
                     }
 //                    insOrdersKindService.saveBatch(insOrdersKinds);
 
@@ -199,7 +197,7 @@ public class SyncCarInfoHandler {
                 insOrdersCarInfoService.saveBatch(insOrdersCarInfos);
                 insOrdersCarUserInfoService.saveBatch(insOrdersCarUserInfos);
                 insOrdersRiskService.saveBatch(insOrdersRisks);
-                insOrdersKindService.saveBatch(insOrdersKinds);
+                insOrdersKindService.saveBatch(insOrdersKings);
                 insOrdersTaxService.saveBatch(insOrdersTaxes);
             }
 

src/main/java/com/ydtech/modules/xxl/handler/SyncInsAreaCompany.java

@@ -99,7 +99,7 @@ public class SyncInsAreaCompany {
                     InsAreaCompanyCarInfo carInfo = new InsAreaCompanyCarInfo();
                     BeanUtils.copyProperties(ordersCarInfo, carInfo);
                     carInfo.setId(IdGenerate.nextId());
-                    insAreaCompany.setCarInfoId(carInfo.getId());
+//                    insAreaCompany.setCarInfoId(carInfo.getId());
                     carInfo.setCompanyId(insAreaCompany.getId());
                     insAreaCompanyCarInfos.add(carInfo);
 //                    insAreaCompanyCarInfoService.saveOrUpdate(carInfo);

src/main/resources/mapper/modules/order/InsOrdersKindMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ydtech.modules.order.dao.InsOrdersKindMapper">
 
-    <resultMap id="BaseResultMap" type="com.ydtech.modules.order.entity.po.InsOrdersKind">
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.order.entity.po.InsOrdersKing">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
             <result property="amount" column="amount" jdbcType="VARCHAR"/>