大家企业报价的开发

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

@@ -57,7 +57,7 @@ public class DaJiaRequestApiComponents {
      */
     private <Q, S> S post(Q q, TradeCode tradeCode, Class<S> tClass) throws Exception {
 
-        String url = apiComponents.getUrl() + tradeCode.getCode() + "/inf.dd";
+        String url = apiComponents.getUrl() + tradeCode.getCode();
 
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.TEXT_PLAIN);

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.insurance.VehicleType;
 import com.ydtech.modules.admin.model.vo.PersonAreaVo;
+import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 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;
@@ -11,6 +12,7 @@ import com.ydtech.modules.order.entity.api.dajia.constants.*;
 import com.ydtech.modules.order.entity.api.dajia.response.ODR2009Response;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.CoreModelsVo;
+import com.ydtech.utils.StringUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -143,6 +145,9 @@ public class ODR1008Request extends DaJiaBaseRequest {
             private Integer applicantWorkDpt;
             @JsonProperty("applicantZipCde")
             private String applicantZipCde;
+            @JsonProperty("applicantTel")
+            private String applicantTel;
+
         }
 
         @NoArgsConstructor
@@ -269,6 +274,8 @@ public class ODR1008Request extends DaJiaBaseRequest {
             private Integer insuredWorkDpt;
             @JsonProperty("insuredZipCde")
             private String insuredZipCde;
+            @JsonProperty("insuredTel")
+            private String insuredTel;
         }
 
         @NoArgsConstructor
@@ -462,39 +469,54 @@ public class ODR1008Request extends DaJiaBaseRequest {
     //设置车主信息
     public void setVehicleOwnerInfo(BaseQuoteInfoVo quoteInfoVo, PersonAreaVo OwnerPersonArea) {
         BodyDTO.VehicleOwnerInfoDTO vehicleOwnerInfoDTO = new BodyDTO.VehicleOwnerInfoDTO();
-        //设置证件号码
-        vehicleOwnerInfoDTO.setVehicleOwnerCCertfCde(quoteInfoVo.getOwnerInfo().getIdentifyNumber());
-        //设置证件类型
-        vehicleOwnerInfoDTO.setVehicleOwnerCCertfCls("01");
-
+        CustomerInfoVo ownerInfo = quoteInfoVo.getOwnerInfo();
+        if(StringUtils.isBlank(ownerInfo.getProperty()) || !"0".equals(ownerInfo.getProperty())) {
+            //设置证件号码
+            vehicleOwnerInfoDTO.setVehicleOwnerCCertfCde(ownerInfo.getIdentifyNumber());
+            //设置证件类型
+            vehicleOwnerInfoDTO.setVehicleOwnerCCertfCls("01");
+            //车主类型
+            vehicleOwnerInfoDTO.setVehicleOwnerCOwnerCls(COwnerCls.CLS1.getCode());
+            //车主性别
+            vehicleOwnerInfoDTO.setVehicleOwnerCSex(getSexFromIdCardNumber(quoteInfoVo.getOwnerInfo().getIdentifyNumber()));
+            //身份证号获取出生日期
+            vehicleOwnerInfoDTO.setVehicleOwnerTBirthday(getBirthdateFromIDCardNumber(quoteInfoVo.getOwnerInfo().getIdentifyNumber()));
+            vehicleOwnerInfoDTO.setVehicleOwnerProvince(OwnerPersonArea.getProvinceCode());
+            vehicleOwnerInfoDTO.setVehicleOwnerCity(OwnerPersonArea.getCityCode());
+            vehicleOwnerInfoDTO.setVehicleOwnerCounty(OwnerPersonArea.getCountyCode());
+        }else{
+            //设置证件号码
+            vehicleOwnerInfoDTO.setVehicleOwnerCCertfCde(ownerInfo.getOrganizationCode());
+            //设置证件类型
+            vehicleOwnerInfoDTO.setVehicleOwnerCCertfCls("04");
+            //车主类型
+            vehicleOwnerInfoDTO.setVehicleOwnerCOwnerCls(COwnerCls.CLS3.getCode());
+
+            vehicleOwnerInfoDTO.setVehicleOwnerProvince(ownerInfo.getProvince());
+            vehicleOwnerInfoDTO.setVehicleOwnerCity(ownerInfo.getCity());
+            vehicleOwnerInfoDTO.setVehicleOwnerCounty(ownerInfo.getCounty());
+        }
         //新能源测试使用
 //        vehicleOwnerInfoDTO.setVehicleOwnerCCertfCde("E88888888");
 //        vehicleOwnerInfoDTO.setVehicleOwnerCCertfCls("02");
-
         //通讯地址
-        vehicleOwnerInfoDTO.setVehicleOwnerCClntAddr(quoteInfoVo.getOwnerInfo().getAddr());
+        vehicleOwnerInfoDTO.setVehicleOwnerCClntAddr(ownerInfo.getAddr());
         //手机号
-        vehicleOwnerInfoDTO.setVehicleOwnerCContactTel(quoteInfoVo.getOwnerInfo().getMobile());
+        vehicleOwnerInfoDTO.setVehicleOwnerCContactTel(ownerInfo.getMobile());
         //邮箱号
-        vehicleOwnerInfoDTO.setVehicleOwnerCEmail(quoteInfoVo.getOwnerInfo().getEmail());
+        vehicleOwnerInfoDTO.setVehicleOwnerCEmail(ownerInfo.getEmail());
         //手机号
-        vehicleOwnerInfoDTO.setVehicleOwnerCMobile(quoteInfoVo.getOwnerInfo().getMobile());
+        vehicleOwnerInfoDTO.setVehicleOwnerCMobile(ownerInfo.getMobile());
         //车主姓名
-        vehicleOwnerInfoDTO.setVehicleOwnerCOwnerNme(quoteInfoVo.getOwnerInfo().getName());
-        //车主类型
-        vehicleOwnerInfoDTO.setVehicleOwnerCOwnerCls(COwnerCls.CLS1.getCode());
+        vehicleOwnerInfoDTO.setVehicleOwnerCOwnerNme(ownerInfo.getName());
+
         //邮编
         vehicleOwnerInfoDTO.setVehicleOwnerCZipCde("030024");
-        //车主出生日期
-        vehicleOwnerInfoDTO.setVehicleOwnerTBirthday(getBirthdateFromIDCardNumber(quoteInfoVo.getOwnerInfo().getIdentifyNumber()));
-        //车主性别
-        vehicleOwnerInfoDTO.setVehicleOwnerCSex(getSexFromIdCardNumber(quoteInfoVo.getOwnerInfo().getIdentifyNumber()));
-        //身份证号获取出生日期
-        vehicleOwnerInfoDTO.setVehicleOwnerTBirthday(getBirthdateFromIDCardNumber(quoteInfoVo.getOwnerInfo().getIdentifyNumber()));
+
 //        //证件有效日期
 //        vehicleOwnerInfoDTO.setVehicleOwnerTEffectiveDate(quoteInfoVo.getOwnerInfo().getIdentifyValidDate());
         //证件失效日期
-        vehicleOwnerInfoDTO.setVehicleOwnerTExpiredDate(quoteInfoVo.getOwnerInfo().getIdentifyValidEndDate());
+        vehicleOwnerInfoDTO.setVehicleOwnerTExpiredDate(ownerInfo.getIdentifyValidEndDate());
         //国家
         vehicleOwnerInfoDTO.setVehicleOwnerCNation(1);
         //国籍
@@ -502,18 +524,16 @@ public class ODR1008Request extends DaJiaBaseRequest {
         //单位性质 默认为9 其他
         vehicleOwnerInfoDTO.setVehicleOwnerCWorkdptKind(9);
 
-        vehicleOwnerInfoDTO.setVehicleOwnerProvince(OwnerPersonArea.getProvinceCode());
-        vehicleOwnerInfoDTO.setVehicleOwnerCity(OwnerPersonArea.getCityCode());
-        vehicleOwnerInfoDTO.setVehicleOwnerCounty(OwnerPersonArea.getCountyCode());
+
         int index = -1;
         if (OwnerPersonArea.getCountyName() != null) {
-            index = quoteInfoVo.getOwnerInfo().getAddr().indexOf(OwnerPersonArea.getCountyName());
+            index = ownerInfo.getAddr().indexOf(OwnerPersonArea.getCountyName());
         }
 
         if (index > -1) {
-            vehicleOwnerInfoDTO.setVehicleOwnerSuffixAddr(quoteInfoVo.getOwnerInfo().getAddr().substring(index + OwnerPersonArea.getCountyName().length()));
+            vehicleOwnerInfoDTO.setVehicleOwnerSuffixAddr(ownerInfo.getAddr().substring(index + OwnerPersonArea.getCountyName().length()));
         } else {
-            vehicleOwnerInfoDTO.setVehicleOwnerSuffixAddr(quoteInfoVo.getOwnerInfo().getAddr());
+            vehicleOwnerInfoDTO.setVehicleOwnerSuffixAddr(ownerInfo.getAddr());
         }
         this.body.setVehicleOwnerInfo(vehicleOwnerInfoDTO);
     }
@@ -521,49 +541,69 @@ public class ODR1008Request extends DaJiaBaseRequest {
     //设置投保人信息
     public void setApplicantInfo(BaseQuoteInfoVo quoteInfoVo, PersonAreaVo policyHolderPersonArea) {
         BodyDTO.ApplicantInfoDTO applicantInfoDTO = new BodyDTO.ApplicantInfoDTO();
-        //设置证件号码
-        applicantInfoDTO.setApplicantCCertfCde(quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber());
-        //设置证件类型
-        applicantInfoDTO.setApplicantCCertfCls("01");
+
+        CustomerInfoVo policyHolderInfo = quoteInfoVo.getPolicyHolderInfo();
+        if(StringUtils.isBlank(policyHolderInfo.getProperty()) || !"0".equals(policyHolderInfo.getProperty())) {
+            //设置证件号码
+            applicantInfoDTO.setApplicantCCertfCde(policyHolderInfo.getIdentifyNumber());
+            //设置证件类型
+            applicantInfoDTO.setApplicantCCertfCls("01");
+            //客户类型
+            applicantInfoDTO.setApplicantClntMrk(COwnerCls.CLS1.getCode());
+            //投保人出生日期
+            applicantInfoDTO.setApplicantTBirthday(getBirthdateFromIDCardNumber(policyHolderInfo.getIdentifyNumber()));
+            //投保人性别
+            applicantInfoDTO.setApplicantSex(getSexFromIdCardNumber(policyHolderInfo.getIdentifyNumber()));
+            //省市县
+            applicantInfoDTO.setApplicantProvince(policyHolderPersonArea.getProvinceCode());
+            applicantInfoDTO.setApplicantCity(policyHolderPersonArea.getCityCode());
+            applicantInfoDTO.setApplicantCounty(policyHolderPersonArea.getCountyCode());
+        }else{
+            //设置证件号码
+            applicantInfoDTO.setApplicantCCertfCde(policyHolderInfo.getOrganizationCode());
+            //设置证件类型
+            applicantInfoDTO.setApplicantCCertfCls("04");
+            //客户类型
+            applicantInfoDTO.setApplicantClntMrk(COwnerCls.CLS3.getCode());
+            //省市县
+            applicantInfoDTO.setApplicantProvince(policyHolderInfo.getProvince());
+            applicantInfoDTO.setApplicantCity(policyHolderInfo.getCity());
+            applicantInfoDTO.setApplicantCounty(policyHolderInfo.getCounty());
+            applicantInfoDTO.setApplicantTel(policyHolderInfo.getTel());
+        }
+
         //新能源测试使用
 //        applicantInfoDTO.setApplicantCCertfCde("E88888888");
 //        applicantInfoDTO.setApplicantCCertfCls("02");
-        //客户类型
-        applicantInfoDTO.setApplicantClntMrk(1);
+
         //通讯地址
-        applicantInfoDTO.setApplicantClntAddr(quoteInfoVo.getPolicyHolderInfo().getAddr());
+        applicantInfoDTO.setApplicantClntAddr(policyHolderInfo.getAddr());
         //手机号
-        applicantInfoDTO.setApplicantMobile(quoteInfoVo.getPolicyHolderInfo().getMobile());
+        applicantInfoDTO.setApplicantMobile(policyHolderInfo.getMobile());
         //邮箱号
-        applicantInfoDTO.setApplicantEmail(quoteInfoVo.getPolicyHolderInfo().getEmail());
+        applicantInfoDTO.setApplicantEmail(policyHolderInfo.getEmail());
         //投保人姓名
-        applicantInfoDTO.setApplicantNme(quoteInfoVo.getPolicyHolderInfo().getName());
-        //投保人出生日期
-        applicantInfoDTO.setApplicantTBirthday(getBirthdateFromIDCardNumber(quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber()));
+        applicantInfoDTO.setApplicantNme(policyHolderInfo.getName());
+
         //邮编
 //        vehicleOwnerInfoDTO.setVehicleOwnerCZipCde(quoteInfoVo.getOwnerInfo().get)
-        //投保人性别
-        applicantInfoDTO.setApplicantSex(getSexFromIdCardNumber(quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber()));
         //证件生效日期
-        applicantInfoDTO.setApplicantTEffectiveDate(quoteInfoVo.getPolicyHolderInfo().getIdentifyValidDate());
+        applicantInfoDTO.setApplicantTEffectiveDate(policyHolderInfo.getIdentifyValidDate());
         //证件失效日期
-        applicantInfoDTO.setApplicantTExpiredDate(quoteInfoVo.getOwnerInfo().getIdentifyValidEndDate());
+        applicantInfoDTO.setApplicantTExpiredDate(policyHolderInfo.getIdentifyValidEndDate());
         //证件上地址
-        applicantInfoDTO.setApplicantHomeAddr(quoteInfoVo.getPolicyHolderInfo().getAddr());
+        applicantInfoDTO.setApplicantHomeAddr(policyHolderInfo.getAddr());
         //国籍
 //        applicantInfoDTO.set(1);
-        //省市县
-        applicantInfoDTO.setApplicantProvince(policyHolderPersonArea.getProvinceCode());
-        applicantInfoDTO.setApplicantCity(policyHolderPersonArea.getCityCode());
-        applicantInfoDTO.setApplicantCounty(policyHolderPersonArea.getCountyCode());
+
         int index = -1;
         if (policyHolderPersonArea.getCountyName() != null) {
-            index = quoteInfoVo.getOwnerInfo().getAddr().indexOf(policyHolderPersonArea.getCountyName());
+            index = policyHolderInfo.getAddr().indexOf(policyHolderPersonArea.getCountyName());
         }
         if (index > -1) {
-            applicantInfoDTO.setApplicantSuffixAddr(quoteInfoVo.getOwnerInfo().getAddr().substring(index + policyHolderPersonArea.getCountyName().length()));
+            applicantInfoDTO.setApplicantSuffixAddr(policyHolderInfo.getAddr().substring(index + policyHolderPersonArea.getCountyName().length()));
         } else {
-            applicantInfoDTO.setApplicantSuffixAddr(quoteInfoVo.getOwnerInfo().getAddr());
+            applicantInfoDTO.setApplicantSuffixAddr(policyHolderInfo.getAddr());
         }
 //        applicantInfoDTO.setApplicantZipCde("030024");
         this.body.setApplicantInfo(applicantInfoDTO);
@@ -572,48 +612,66 @@ public class ODR1008Request extends DaJiaBaseRequest {
     //设置被保人信息
     public void setInsuredInfo(BaseQuoteInfoVo quoteInfoVo, PersonAreaVo insuredPersonArea) {
         BodyDTO.InsuredInfoDTO insuredInfoDTO = new BodyDTO.InsuredInfoDTO();
-        //设置证件号码
-        insuredInfoDTO.setInsuredCertfCde(quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber());
-        //设置证件类型
-        insuredInfoDTO.setInsuredCertfCls("01");
+        CustomerInfoVo insuredPersonInfo = quoteInfoVo.getInsuredPersonInfo();
+        if(StringUtils.isBlank(insuredPersonInfo.getProperty()) || !"0".equals(insuredPersonInfo.getProperty())) {
+            //设置证件号码
+            insuredInfoDTO.setInsuredCertfCde(insuredPersonInfo.getIdentifyNumber());
+            //设置证件类型
+            insuredInfoDTO.setInsuredCertfCls("01");
+            //客户类型
+            insuredInfoDTO.setInsuredClntMrk(COwnerCls.CLS1.getCode());
+            //被保人出生日期
+            insuredInfoDTO.setInsuredTBirthday(getBirthdateFromIDCardNumber(insuredPersonInfo.getIdentifyNumber()));
+            //被保人性别
+            insuredInfoDTO.setInsuredSex(getSexFromIdCardNumber(insuredPersonInfo.getIdentifyNumber()));
+            //省市县
+            insuredInfoDTO.setInsuredProvince(insuredPersonArea.getProvinceCode());
+            insuredInfoDTO.setInsuredCity(insuredPersonArea.getCityCode());
+            insuredInfoDTO.setInsuredCounty(insuredPersonArea.getCountyCode());
+        }else{
+            //设置证件号码
+            insuredInfoDTO.setInsuredCertfCde(insuredPersonInfo.getOrganizationCode());
+            //设置证件类型
+            insuredInfoDTO.setInsuredCertfCls("04");
+            //客户类型
+            insuredInfoDTO.setInsuredClntMrk(COwnerCls.CLS3.getCode());
+            //省市县
+            insuredInfoDTO.setInsuredProvince(insuredPersonInfo.getProvince());
+            insuredInfoDTO.setInsuredCity(insuredPersonInfo.getCity());
+            insuredInfoDTO.setInsuredCounty(insuredPersonInfo.getCounty());
+            insuredInfoDTO.setInsuredTel(insuredPersonInfo.getTel());
+        }
+
         //新能源测试使用
 //        insuredInfoDTO.setInsuredCertfCde("E88888888");
 //        insuredInfoDTO.setInsuredCertfCls("02");
-        //客户类型
-        insuredInfoDTO.setInsuredClntMrk(1);
+
         //通讯地址
-        insuredInfoDTO.setInsuredClntAddr(quoteInfoVo.getInsuredPersonInfo().getAddr());
+        insuredInfoDTO.setInsuredClntAddr(insuredPersonInfo.getAddr());
         //证件上地址
-        insuredInfoDTO.setInsuredHomeAddr(quoteInfoVo.getInsuredPersonInfo().getAddr());
+        insuredInfoDTO.setInsuredHomeAddr(insuredPersonInfo.getAddr());
         //居住地址
-        insuredInfoDTO.setInsuredResidAddr(quoteInfoVo.getInsuredPersonInfo().getAddr());
+        insuredInfoDTO.setInsuredResidAddr(insuredPersonInfo.getAddr());
         //手机号
-        insuredInfoDTO.setInsuredMobile(quoteInfoVo.getInsuredPersonInfo().getMobile());
+        insuredInfoDTO.setInsuredMobile(insuredPersonInfo.getMobile());
         //邮箱号
-        insuredInfoDTO.setInsuredEmail(quoteInfoVo.getInsuredPersonInfo().getEmail());
+        insuredInfoDTO.setInsuredEmail(insuredPersonInfo.getEmail());
         //被保人姓名
-        insuredInfoDTO.setInsuredNme(quoteInfoVo.getInsuredPersonInfo().getName());
-        //被保人出生日期
-        insuredInfoDTO.setInsuredTBirthday(getBirthdateFromIDCardNumber(quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber()));
-        //被保人性别
-        insuredInfoDTO.setInsuredSex(getSexFromIdCardNumber(quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber()));
+        insuredInfoDTO.setInsuredNme(insuredPersonInfo.getName());
         //身份证生效日期
-        insuredInfoDTO.setInsuredTEffectiveDate(quoteInfoVo.getInsuredPersonInfo().getIdentifyValidDate());
+        insuredInfoDTO.setInsuredTEffectiveDate(insuredPersonInfo.getIdentifyValidDate());
         //身份证失效日期
-        insuredInfoDTO.setInsuredTExpiredDate(quoteInfoVo.getInsuredPersonInfo().getIdentifyValidEndDate());
-        //省市县
-        insuredInfoDTO.setInsuredProvince(insuredPersonArea.getProvinceCode());
-        insuredInfoDTO.setInsuredCity(insuredPersonArea.getCityCode());
-        insuredInfoDTO.setInsuredCounty(insuredPersonArea.getCountyCode());
-        insuredInfoDTO.setInsuredSuffixAddr(quoteInfoVo.getInsuredPersonInfo().getAddr());
+        insuredInfoDTO.setInsuredTExpiredDate(insuredPersonInfo.getIdentifyValidEndDate());
+
+        insuredInfoDTO.setInsuredSuffixAddr(insuredPersonInfo.getAddr());
         int index = -1;
         if (insuredPersonArea.getCountyName() != null) {
-            index = quoteInfoVo.getOwnerInfo().getAddr().indexOf(insuredPersonArea.getCountyName());
+            index = insuredPersonInfo.getAddr().indexOf(insuredPersonArea.getCountyName());
         }
         if (index > -1) {
-            insuredInfoDTO.setInsuredSuffixAddr(quoteInfoVo.getOwnerInfo().getAddr().substring(index + insuredPersonArea.getCountyName().length()));
+            insuredInfoDTO.setInsuredSuffixAddr(insuredPersonInfo.getAddr().substring(index + insuredPersonArea.getCountyName().length()));
         } else {
-            insuredInfoDTO.setInsuredSuffixAddr(quoteInfoVo.getOwnerInfo().getAddr());
+            insuredInfoDTO.setInsuredSuffixAddr(insuredPersonInfo.getAddr());
         }
         //邮编
 //        insuredInfoDTO.setInsuredZipCde("030024");

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

@@ -1,11 +1,13 @@
 package com.ydtech.modules.order.entity.api.dajia.request;
 
+import com.alibaba.fastjson.JSONObject;
 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.constants.ServiceCode;
 import com.ydtech.modules.order.entity.api.dajia.response.ODR1009Response;
+import com.ydtech.utils.StringUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -189,7 +191,7 @@ public class ODR1010Request extends DaJiaBaseRequest {
         //操作员姓名
         body.businessInfo.setBusiOprNme(daJiaConfigureParameters.getOperatorName());
         //业务来源
-        body.businessInfo.setBusiBsnsTyp(19002);
+        body.businessInfo.setBusiBsnsTyp(Integer.parseInt(daJiaConfigureParameters.getBusinessSource()));
         //业务员代码
         body.businessInfo.setBusiSlsCde(daJiaConfigureParameters.getSalespersonCode());
         //推荐人代码
@@ -232,18 +234,33 @@ public class ODR1010Request extends DaJiaBaseRequest {
 
         //车架号
         body.checkInfo.setVehicleFrmNo(insOrders.getFrameno());
+        JSONObject applyInfo = insOrders.getApplyinfo();
+        JSONObject insureInfo = insOrders.getInsureinfo();
+        String applyProperty = applyInfo.getString("property");
+        String insureProperty = insureInfo.getString("property");
         //投保人名称
-        body.checkInfo.setApplicantNme(insOrders.getApplyinfo().getString("name"));
-        //投保人证件号码
-        body.checkInfo.setApplicantCCertfCde(insOrders.getApplyinfo().getString("identifyNumber"));
+        body.checkInfo.setApplicantNme(applyInfo.getString("name"));
+        if(StringUtils.isBlank(applyProperty) || !"0".equals(applyProperty)){
+            //投保人证件号码
+            body.checkInfo.setApplicantCCertfCde(applyInfo.getString("identifyNumber"));
+        }else{
+            //投保人证件号码
+            body.checkInfo.setApplicantCCertfCde(applyInfo.getString("organizationCode"));
+        }
         //投保人手机号
-        body.checkInfo.setApplicantMobile(insOrders.getApplyinfo().getString("mobile"));
+        body.checkInfo.setApplicantMobile(applyInfo.getString("mobile"));
+
         //被保人名称
-        body.checkInfo.setInsuredNme(insOrders.getInsureinfo().getString("name"));
-        //被保人证件号码
-        body.checkInfo.setInsuredCertfCde(insOrders.getInsureinfo().getString("identifyNumber"));
+        body.checkInfo.setInsuredNme(insureInfo.getString("name"));
+        if(StringUtils.isBlank(insureProperty) || !"0".equals(insureProperty)){
+            //被保人证件号码
+            body.checkInfo.setInsuredCertfCde(insureInfo.getString("identifyNumber"));
+        }else{
+            //被保人证件号码
+            body.checkInfo.setInsuredCertfCde(insureInfo.getString("organizationCode"));
+        }
         //被保人手机号
-        body.checkInfo.setInsuredMobile(insOrders.getInsureinfo().getString("mobile"));
+        body.checkInfo.setInsuredMobile(insureInfo.getString("mobile"));
 
     }
 

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

@@ -44,6 +44,7 @@ import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.DateTimeUtil;
+import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -185,20 +186,30 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             configureParametersComponents.toEntity(daJiaConfigureParameters, t.getAgreementId());
             PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(t.getAgreementId());
 
-            //车主区划信息
-            PersonAreaVo ownerPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getOwnerInfo().getAddr(), quoteInfoVo.getOwnerInfo().getIdentifyNumber());
+            CustomerInfoVo ownerInfo = quoteInfoVo.getOwnerInfo();
+            CustomerInfoVo policyHolderInfo = quoteInfoVo.getPolicyHolderInfo();
+            CustomerInfoVo insuredPersonInfo = quoteInfoVo.getInsuredPersonInfo();
 
-            //投保人区划信息
-            PersonAreaVo policyHolderPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getPolicyHolderInfo().getAddr(), quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber());
-            PersonAreaVo insuredPersonArea;
-            //投保人等于被保人
-            if (quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber().equals(quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber())) {
-                insuredPersonArea = policyHolderPersonArea;
-            } else {
-                //被保人区划信息
-                insuredPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getInsuredPersonInfo().getAddr(), quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber());
+            PersonAreaVo ownerPersonArea = new PersonAreaVo();
+            PersonAreaVo policyHolderPersonArea = new PersonAreaVo();
+            PersonAreaVo insuredPersonArea = new PersonAreaVo();
+            if (StringUtils.isBlank(ownerInfo.getProperty()) || !"0".equals(ownerInfo.getProperty())) {
+                //车主区划信息
+                ownerPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getOwnerInfo().getAddr(), quoteInfoVo.getOwnerInfo().getIdentifyNumber());
+            }
+            if (StringUtils.isBlank(policyHolderInfo.getProperty()) || !"0".equals(policyHolderInfo.getProperty())) {
+                //投保人区划信息
+                policyHolderPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getPolicyHolderInfo().getAddr(), quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber());
+            }
+            if (StringUtils.isBlank(insuredPersonInfo.getProperty()) || !"0".equals(insuredPersonInfo.getProperty())) {
+                //投保人等于被保人
+                if (quoteInfoVo.getPolicyHolderInfo().getIdentifyNumber().equals(quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber())) {
+                    insuredPersonArea = policyHolderPersonArea;
+                } else {
+                    //被保人区划信息
+                    insuredPersonArea = sysAreaService.queryByAddress(quoteInfoVo.getInsuredPersonInfo().getAddr(), quoteInfoVo.getInsuredPersonInfo().getIdentifyNumber());
+                }
             }
-
             // 1.获取业务订单号接口
             String orderNo = getOrderNo(daJiaConfigureParameters);
             //生成业务id  1008 1010 接口使用
@@ -443,7 +454,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
         if (!Objects.isNull(nvhlodr1001Response)) {
             insAreaCompany.setCrossInsurance(JSONArray.parseArray(JSON.toJSONString(nvhlodr1001Response.getPolicyInfos())));
         }
-        insAreaCompanyService.insertCompanyAndOrders(insAreaCompany, insAreaCompanyAccidentalDriving);
+        insAreaCompanyService.insertCompanyAndOrders(companyId,insAreaCompany, insAreaCompanyAccidentalDriving);
         quoteRespVo.setCompanyId(companyId);
         quoteRespVo.setOrderno(quoteInfoVo.getOrderNo());
         // 车船税

src/main/resources/application-prod.yml

@@ -350,7 +350,7 @@ qrcode:
 #大家财险api
 dajia:
   api:
-    url: https://ics.djbx.com/sip-agent/simpleRequest/
+    url: https://open-ics.djbx.com/dip-agent/agent/invokeForVchicle/api/
     encryptKey: "By92YPLvG89XyFqv"
 
 

src/main/resources/application-test.yml

@@ -410,7 +410,7 @@ huatai:
 #大家财险api
 dajia:
   api:
-    url: https://ics-test.djbx.com/sip-agent/simpleRequest/
+    url: https://uatagent-ics.djbx.com/dip-agent/agent/invokeForVchicle/api/
     encryptKey: "qwertyuiopasdfgh"
 
 # api url