国任企业报价取消

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

@@ -176,19 +176,11 @@ public class CarPriceReq {
         /**
          * 车主信息
          */
-        if(StringUtils.isBlank(ownerInfo.getProperty()) || !"0".equals(ownerInfo.getProperty())){
-            prpTitemCar.setCarOwner(ownerInfo.getName());
-            prpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getIdentifyNumber());
-            prpTitemCar.setCarOwnerIdentifyType("01");
-            //车主客户性质	carOwnerNature	字符串	Y	1:机关 2:企业 0:个人
-            prpTitemCar.setCarOwnerNature("0");
-        }else{
-            prpTitemCar.setCarOwner(ownerInfo.getName());
-            prpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getOrganizationCode());
-            prpTitemCar.setCarOwnerIdentifyType("74");
-            //车主客户性质	carOwnerNature	字符串	Y	1:机关 2:企业 0:个人
-            prpTitemCar.setCarOwnerNature("2");
-        }
+        prpTitemCar.setCarOwner(ownerInfo.getName());
+        prpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getIdentifyNumber());
+        prpTitemCar.setCarOwnerIdentifyType("01");
+        //车主客户性质	carOwnerNature	字符串	Y	1:机关 2:企业 0:个人
+        prpTitemCar.setCarOwnerNature("0");
         prpTitemCar.setIDValidStartDate(ownerInfo.getIdentifyValidDate());
         prpTitemCar.setIdValidDate(ownerInfo.getIdentifyValidEndDate());
         /**

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

@@ -8,7 +8,6 @@ import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.guoren.GuoRenSpecialAgreementVo;
-import com.ydtech.utils.StringUtils;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -70,15 +69,9 @@ public class InsuranceSlipReq {
          */
         prpTinsured.setAppliName(policyHolderInfo.getName());
         //投保人性质	appliInsuredNature	字符串	Y	3自然人，4法人
-        if(StringUtils.isBlank(policyHolderInfo.getProperty()) || "0".equals(policyHolderInfo.getProperty())) {
-            prpTinsured.setAppliInsuredNature("3");
-            prpTinsured.setAppliIdentifyType("01");
-            prpTinsured.setAppliIdentifyNumber(policyHolderInfo.getIdentifyNumber());
-        }else {
-            prpTinsured.setAppliInsuredNature("4");
-            prpTinsured.setAppliIdentifyType("74");
-            prpTinsured.setAppliIdentifyNumber(policyHolderInfo.getOrganizationCode());
-        }
+        prpTinsured.setAppliInsuredNature("3");
+        prpTinsured.setAppliIdentifyType("01");
+        prpTinsured.setAppliIdentifyNumber(policyHolderInfo.getIdentifyNumber());
         prpTinsured.setAppliMobile(policyHolderInfo.getMobile());
         prpTinsured.setAppliAddress(policyHolderInfo.getAddr());
         prpTinsured.setAppliPostCode("");
@@ -91,17 +84,10 @@ public class InsuranceSlipReq {
          *  被保人信息
          */
         prpTinsured.setInsuredName(insuredPersonInfo.getName());
-
         //投保人性质	appliInsuredNature	字符串	Y	3自然人，4法人
-        if(StringUtils.isBlank(insuredPersonInfo.getProperty()) || "0".equals(insuredPersonInfo.getProperty())) {
-            prpTinsured.setInsuredInsuredNature("3");
-            prpTinsured.setInsuredIdentifyType("01");
-            prpTinsured.setInsuredIdentifyNumber(policyHolderInfo.getIdentifyNumber());
-        }else {
-            prpTinsured.setInsuredInsuredNature("4");
-            prpTinsured.setInsuredIdentifyType("74");
-            prpTinsured.setInsuredIdentifyNumber(policyHolderInfo.getOrganizationCode());
-        }
+        prpTinsured.setInsuredInsuredNature("3");
+        prpTinsured.setInsuredIdentifyType("01");
+        prpTinsured.setInsuredIdentifyNumber(insuredPersonInfo.getIdentifyNumber());
         prpTinsured.setInsuredMobile(insuredPersonInfo.getMobile());
         prpTinsured.setInsuredAddress(insuredPersonInfo.getAddr());
         prpTinsured.setInsuredPostCode("");
@@ -304,23 +290,19 @@ public class InsuranceSlipReq {
             CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
 
             this.ocrCarOwner = ownerInfo.getName();
-
-            this.ocrCarOwnerIdentifyNumber = (StringUtils.isBlank(ownerInfo.getProperty()) || !"0".equals(ownerInfo.getProperty())) ?
-                    ownerInfo.getIdentifyNumber() : ownerInfo.getOrganizationCode();
+            this.ocrCarOwnerIdentifyNumber = ownerInfo.getIdentifyNumber();
             this.ocrCarAddress = ownerInfo.getAddr();
             this.ocrIdvalidStartDate = ownerInfo.getIdentifyValidDate();
             this.ocrIdvalidDate = ownerInfo.getIdentifyValidEndDate();
 
             this.ocrInsuredName = insuredPersonInfo.getName();
-            this.ocrInsuredIdentifyNumber = (StringUtils.isBlank(insuredPersonInfo.getProperty()) || !"0".equals(insuredPersonInfo.getProperty())) ?
-                    insuredPersonInfo.getIdentifyNumber() : insuredPersonInfo.getOrganizationCode();
+            this.ocrInsuredIdentifyNumber = insuredPersonInfo.getIdentifyNumber();
             this.ocrInsuredAddress = insuredPersonInfo.getAddr();
             this.ocrInsuredIDValidStartDate = insuredPersonInfo.getIdentifyValidDate();
             this.ocrInsuredIDValidDate = insuredPersonInfo.getIdentifyValidEndDate();
 
             this.ocrAppliName = policyHolderInfo.getName();
-            this.ocrAppliIdentifyNumber = (StringUtils.isBlank(policyHolderInfo.getProperty()) || !"0".equals(policyHolderInfo.getProperty())) ?
-                    policyHolderInfo.getIdentifyNumber() : policyHolderInfo.getOrganizationCode();
+            this.ocrAppliIdentifyNumber = policyHolderInfo.getIdentifyNumber();
             this.ocrAppliAddress = policyHolderInfo.getAddr();
             this.ocrAppliIDValidStartDate = policyHolderInfo.getIdentifyValidDate();
             this.ocrAppliIDValidDate = policyHolderInfo.getIdentifyValidEndDate();

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

@@ -178,16 +178,10 @@ public class NonAutoInsOrderReq {
                 private String phoneNo;
 
                 public OrderApplDTO(CustomerInfoVo customerInfoVo) {
-                    if (StringUtils.isBlank(customerInfoVo.getProperty()) || !"0".equals(customerInfoVo.getProperty())) {
-                        this.applType = "1";
-                        this.certfNo = customerInfoVo.getIdentifyNumber();
-                        this.certfType = "01";
-                    }else{
-                        this.applType = "2";
-                        this.certfNo = customerInfoVo.getOrganizationCode();
-                        this.certfType = "74";
-                    }
                     this.applName = customerInfoVo.getName();
+                    this.applType = "1";
+                    this.certfNo = customerInfoVo.getIdentifyNumber();
+                    this.certfType = "01";
                     this.contactName = customerInfoVo.getName();
                     this.phoneNo = customerInfoVo.getMobile();
                 }
@@ -339,20 +333,12 @@ public class NonAutoInsOrderReq {
                 private String planNo;
 
                 public InsuredListDTO(CustomerInfoVo customerInfoVo) {
-                    if(StringUtils.isBlank(customerInfoVo.getProperty()) || !"0".equals(customerInfoVo.getProperty())) {
-                        this.certfNo = customerInfoVo.getIdentifyNumber();
-                        this.certfType = "01";
-                        //客户类型	insuredType	String	Y	 1-个人，2-企业
-                        this.insuredType = "1";
-                    }else{
-                        this.certfNo = customerInfoVo.getOrganizationCode();
-                        this.certfType = "74";
-                        //客户类型	insuredType	String	Y	 1-个人，2-企业
-                        this.insuredType = "2";
-                    }
-
+                    this.certfNo = customerInfoVo.getIdentifyNumber();
+                    this.certfType = "01";
                     this.countryName = "中国";
                     this.insuredName = customerInfoVo.getName();
+                    //客户类型	insuredType	String	Y	 1-个人，2-企业
+                    this.insuredType = "1";
                     this.phoneNo = customerInfoVo.getMobile();
                     this.planNo = "1";
                 }

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

@@ -197,13 +197,10 @@ public class PremiumReq {
          */
         CiDTO.PrpTitemCarDTO ciPrpTitemCar = new CiDTO.PrpTitemCarDTO();
         ciPrpTitemCar.setClauseType("F40");
-        if(StringUtils.isBlank(ownerInfo.getProperty()) || !"0".equals(ownerInfo.getProperty())) {
-            ciPrpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getIdentifyNumber());
-        }else{
-            ciPrpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getIdentifyNumber());
-        }
-        ciPrpTitemCar.setOtherNature("0");
         ciPrpTitemCar.setCarOwner(ownerInfo.getName());
+        ciPrpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getIdentifyNumber());
+        ciPrpTitemCar.setOtherNature("0");
+
         ciDto.setPrpTitemCar(ciPrpTitemCar);
         ciDto.setPrptitemkindList(prptitemkindList);
         ciDto.setPrpTmain(ciPrpTmain);
@@ -258,11 +255,7 @@ public class PremiumReq {
 
         biPrpTitemCar.setClauseType("F54");
         biPrpTitemCar.setCarOwner(ownerInfo.getName());
-        if (StringUtils.isBlank(ownerInfo.getProperty()) || !"0".equals(ownerInfo.getProperty())) {
-            biPrpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getIdentifyNumber());
-        }else{
-            biPrpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getOrganizationCode());
-        }
+        biPrpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getIdentifyNumber());
         biPrpTitemCar.setOtherNature("0");
         biPrpTitemCar.setCiInsureDemandPay(new ArrayList<>());
         biPrpTitemCar.setCiInsureDemandWarningClaim(new ArrayList<>());