Merge remote-tracking branch 'origin/helixiao-dev' into test-d

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

@@ -91,6 +91,9 @@ public class CustomerInfoVo {
     @ApiModelProperty(value = "经营范围")
     private String scope;
 
+    @ApiModelProperty(value = "联系人")
+    private String legalPerson;
+
 
     public boolean contrastInfo(CustomerInfoVo customerInfoVo) {
         if (!ObjectUtils.nullSafeEquals(this.name, customerInfoVo.getName())) {

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

@@ -139,13 +139,13 @@ public class Applicant {
      */
     @JacksonXmlProperty(localName = "CResvTxt5")
     private String CResvTxt5;
-//
-//    /**
-//     * 单位性质
-//     * 代码表
-//     */
-//    @JacksonXmlProperty(localName = "CWorkDpt")
-//    private String CWorkDpt;
+
+    /**
+     * 单位性质
+     * 代码表
+     */
+    @JacksonXmlProperty(localName = "CWorkDpt")
+    private String CWorkDpt;
 //
 //    /**
 //     * 民族
@@ -167,27 +167,27 @@ public class Applicant {
 //     */
 //    @JacksonXmlProperty(localName = "TEffectedDate")
 //    private String TEffectedDate;
-//
-//    /**
-//     * 行业
-//     * 法人场景，代码表
-//     */
-//    @JacksonXmlProperty(localName = "CTrdCde")
-//    private String CTrdCde;
-//
-//    /**
-//     * 经营范围
-//     * 法人场景
-//     */
-//    @JacksonXmlProperty(localName = "COccupation")
-//    private String COccupation;
-//
-//    /**
-//     * 注册资本金
-//     * 单位万元/法人场景
-//     */
-//    @JacksonXmlProperty(localName = "NResvNum3")
-//    private String NResvNum3;
+
+    /**
+     * 行业
+     * 法人场景，代码表
+     */
+    @JacksonXmlProperty(localName = "CTrdCde")
+    private String CTrdCde;
+
+    /**
+     * 经营范围
+     * 法人场景
+     */
+    @JacksonXmlProperty(localName = "COccupation")
+    private String COccupation;
+
+    /**
+     * 注册资本金
+     * 单位万元/法人场景
+     */
+    @JacksonXmlProperty(localName = "NResvNum3")
+    private String NResvNum3;
 
     /**
      * 所在省
@@ -210,12 +210,12 @@ public class Applicant {
     @JacksonXmlProperty(localName = "CCounty")
     private String CCounty;
 
-//    /**
-//     * 注册资本金币种
-//     * 代码表
-//     */
-//    @JacksonXmlProperty(localName = "NResvNum3Cur")
-//    private String NResvNum3Cur;
+    /**
+     * 注册资本金币种
+     * 代码表
+     */
+    @JacksonXmlProperty(localName = "NResvNum3Cur")
+    private String NResvNum3Cur;
 
     /**
      * 国家/地区
@@ -236,28 +236,51 @@ public class Applicant {
 //        CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
 //        CustomerInfoVo policyHolderInfo = yaQuoteInfoVo.getPolicyHolderInfo();
         Applicant applicant = new Applicant();
+        //投保人类型： 0:法人 1:个人（中国籍） 2: 个人（非中国籍）
+        String property = policyHolderInfo.getProperty();
+        if ("0".equals(property)) {
+            //投保人证件类型
+            applicant.setCCertfCls("110004");
+            //投保人证件号
+            applicant.setCCertfCde(policyHolderInfo.getOrganizationCode());
+            applicant.setCClntAddr(policyHolderInfo.getAddr());
+
+            applicant.setCProvince(policyHolderInfo.getProvince());
+            applicant.setCCity(policyHolderInfo.getCity());
+            applicant.setCCounty(policyHolderInfo.getCounty());
+            //行业
+            applicant.setCTrdCde("201799");
+            applicant.setCOccupation(policyHolderInfo.getScope());
+            applicant.setNResvNum3(policyHolderInfo.getRegisteredCapital());
+            applicant.setNResvNum3Cur("01");
+            applicant.setCWorkDpt("900");
+            //联系人
+            applicant.setCCntrNme(policyHolderInfo.getLegalPerson());
+
+        }else{
+            applicant.setCClntAddr(policyHolderInfo.getAddr());
+            applicant.setCCertfCde(policyHolderInfo.getIdentifyNumber());
+            applicant.setCCertfCls("120001");
+            applicant.setTBirthday(IDCardUtils.GetBirthday(policyHolderInfo.getIdentifyNumber()));
+            applicant.setCSex(IDCardUtils.GetYcSex(policyHolderInfo.getIdentifyNumber()));
+            applicant.setCCntrNme(policyHolderInfo.getName());
+            // 增加团车标志
+            applicant.setCMassCarMrk(ycConfigureParameters.getCCntrNme());
+        }
 
-        applicant.setCAppNme(policyHolderInfo.getName());
-        applicant.setCClntAddr(policyHolderInfo.getAddr());
-        applicant.setCMobile(policyHolderInfo.getMobile());
-        applicant.setCCertfCde(policyHolderInfo.getIdentifyNumber());
-        applicant.setCCertfCls("120001");
         applicant.setCResvTxt5("000");
-        applicant.setCClntMrk("1");
+        applicant.setCMobile(policyHolderInfo.getMobile());
         applicant.setCAreaCde("103132");
-        applicant.setTBirthday(IDCardUtils.GetBirthday(policyHolderInfo.getIdentifyNumber()));
-        applicant.setCSex(IDCardUtils.GetYcSex(policyHolderInfo.getIdentifyNumber()));
-        applicant.setCCntrNme(policyHolderInfo.getName());
+        //投保人姓名
+        applicant.setCAppNme(policyHolderInfo.getName());
+        //投保人客户分类
+        applicant.setCClntMrk(property);
         if(StringUtils.isNullOrEmpty(applicant.getCCntrNme())){
             applicant.setCCntrNme(policyHolderInfo.getName());
         }
-        // 增加团车标志
-        applicant.setCMassCarMrk(ycConfigureParameters.getCCntrNme());
-
-//        applicant.setCProvince(Province.buildProvince(policyHolderInfo.getAddr()));
-//        applicant.setCCity(City.buildCity(policyHolderInfo.getAddr()));
         applicant.setCRelCde(ownerInfo.getName().equals(policyHolderInfo.getName()) ? "601005" : "601008");
         applicant.setTCertfClsValiDate(policyHolderInfo.getIdentifyValidEndDate());
+
         return applicant;
     }
 

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

@@ -251,26 +251,49 @@ public class Insured {
     @JacksonXmlProperty(localName = "CRelApplicantDesc")
     private String CRelApplicantDesc;
 
+    /**
+     * 行业
+     * 法人场景，代码表
+     */
+    @JacksonXmlProperty(localName = "CTrdCde")
+    private String CTrdCde;
+
 
     public static Insured buildApplicant(CustomerInfoVo ownerInfo, CustomerInfoVo insuredPersonInfo) {
 
         Insured insured = new Insured();
-
+        //被保人类型： 0:法人 1:个人（中国籍） 2: 个人（非中国籍）
+        String property = insuredPersonInfo.getProperty();
+        if ("0".equals(property)) {
+            insured.setCCertfCls("110004");
+            insured.setCCertfCde(insuredPersonInfo.getOrganizationCode());
+            insured.setCProvince(insuredPersonInfo.getProvince());
+            insured.setCCity(insuredPersonInfo.getCity());
+            insured.setCCounty(insuredPersonInfo.getCounty());
+            //经营范围
+            insured.setCWorkCtt(insuredPersonInfo.getScope());
+            insured.setNResvNum3(insuredPersonInfo.getRegisteredCapital());
+            insured.setNResvNum3Cur("01");
+
+
+        }else {
+            insured.setCCertfCls("120001");
+            insured.setCCertfCde(insuredPersonInfo.getIdentifyNumber());
+            insured.setTBirthday(IDCardUtils.GetBirthday(insuredPersonInfo.getIdentifyNumber()));
+            insured.setCSex(IDCardUtils.GetYcSex(insuredPersonInfo.getIdentifyNumber()));
+        }
+
+        insured.setCWorkDpt("900");
+        insured.setCTrdCde("201799");
+        insured.setCResvTxt5("000");
         insured.setCInsuredNme(insuredPersonInfo.getName());
         insured.setCClntAddr(insuredPersonInfo.getAddr());
         insured.setCMobile(insuredPersonInfo.getMobile());
-        insured.setCCertfCde(insuredPersonInfo.getIdentifyNumber());
-        insured.setCCertfCls("120001");
-        insured.setCClntMrk("1");
+        insured.setCClntMrk(property);
         insured.setCAreaCde("103132");
-        insured.setTBirthday(IDCardUtils.GetBirthday(insuredPersonInfo.getIdentifyNumber()));
-        insured.setCSex(IDCardUtils.GetYcSex(insuredPersonInfo.getIdentifyNumber()));
-
-//        insured.setCProvince(Province.buildProvince(insuredPersonInfo.getAddr()));
-//        insured.setCCity(City.buildCity(insuredPersonInfo.getAddr()));
 
         insured.setTCertfClsValiDate(insuredPersonInfo.getIdentifyValidEndDate());
-
+        insured.setCCntrNme(insuredPersonInfo.getName());
         insured.setCRelCdes(ownerInfo.getName().equals(insuredPersonInfo.getName()) ? "601005" : "601008");
 
 

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

@@ -400,13 +400,18 @@ public class Vhl {
         vhl.setCEngNo(carInfo.getEngineNo());
         vhl.setCFrmNo(carInfo.getVinNo());
         vhl.setCPlateTyp(carInfo.getLicenseTypeCode());
-        vhl.setCUsageCde("336001");
+        if (carInfo.getCarnature().equals("01")) {
+            vhl.setCUsageCde("336002");
+        } else if (carInfo.getCarnature().equals("02")) {
+            vhl.setCUsageCde("336001");
+        }
+        //vhl.setCUsageCde("336001");
         //所属性质（1个人 2企业 3机关）
         if (carInfo.getProperty().equals("1")) {
             vhl.setCBizMrk("338001");
-        } else if (carInfo.getCarnature().equals("2")) {
+        } else if (carInfo.getProperty().equals("2")) {
             vhl.setCBizMrk("338003");
-        } else if (carInfo.getCarnature().equals("3")) {
+        } else if (carInfo.getProperty().equals("3")) {
             vhl.setCBizMrk("338002");
         }
 

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

@@ -107,19 +107,29 @@ public class Vhlowner {
 
         Vhlowner vhlowner = new Vhlowner();
         vhlowner.setCOwnerNme(ownerInfo.getName());
+        //0:法人 1:个人（中国籍） 2: 个人（非中国籍）
+        String property = ownerInfo.getProperty();
+        if ("0".equals(property)) {
 
-        vhlowner.setTBirthday(IDCardUtils.GetBirthday(ownerInfo.getIdentifyNumber()));
-        vhlowner.setCSex(IDCardUtils.GetYcSex(ownerInfo.getIdentifyNumber()));
+            vhlowner.setDrvOwnerCeritType("110004");
+            vhlowner.setDrvOwnerCertiCode(ownerInfo.getOrganizationCode());
+            vhlowner.setCProvince(ownerInfo.getProvince());
+            vhlowner.setCCity(ownerInfo.getCity());
+            vhlowner.setCCounty(ownerInfo.getCounty());
 
-        vhlowner.setDrvOwnerCertiCode(ownerInfo.getIdentifyNumber());
-        vhlowner.setDrvOwnerCeritType("120001");
+        }else{
+
+            vhlowner.setTBirthday(IDCardUtils.GetBirthday(ownerInfo.getIdentifyNumber()));
+            vhlowner.setCSex(IDCardUtils.GetYcSex(ownerInfo.getIdentifyNumber()));
+            vhlowner.setDrvOwnerCeritType("120001");
+            vhlowner.setDrvOwnerCertiCode(ownerInfo.getIdentifyNumber());
+        }
+
+//        vhlowner.setDrvOwnerCeritType("120001");
         vhlowner.setCAreaCde("103132");
         vhlowner.setCMobile(ownerInfo.getMobile());
 
-        vhlowner.setCOwnerCls("1");
-
-//        vhlowner.setCProvince(Province.buildProvince(ownerInfo.getAddr()));
-//        vhlowner.setCCity(City.buildCity(ownerInfo.getAddr()));
+        vhlowner.setCOwnerCls(property);
 
         vhlowner.setCWorkdptKind("900");
         //地址  自建

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

@@ -263,8 +263,23 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
         //组装参数
         Ruote m = Ruote.buildQuoteParam(yaQuoteInfoVo, ycConfigureParameters, adVo, cQryCdeJQ, cQryCdeSY);
-        //构造地区
-        buildRegion(m, yaQuoteInfoVo);
+        //企业车不构建地区
+        String property = carInfo.getProperty();
+        if (!"2".equals(property)) {
+            //构造地区
+            buildRegion(m, yaQuoteInfoVo);
+        }else {
+            //被保人
+            CustomerInfoVo insured = yaQuoteInfoVo.getInsuredPersonInfo();
+            PersonAreaVo insuredPersonAreaVo = sysAreaService.queryByAddressYc(insured.getAddr(), insured.getIdentifyNumber());
+            if (!Objects.isNull(insuredPersonAreaVo)) {
+                m.getRequestLabel().getCondition().getInsured().setCProvince(insuredPersonAreaVo.getProvinceCode());
+                m.getRequestLabel().getCondition().getInsured().setCCity(insuredPersonAreaVo.getCityCode());
+                m.getRequestLabel().getCondition().getInsured().setCCounty(insuredPersonAreaVo.getCountyCode());
+            }
+
+        }
+
         return m;
     }