国任报价修改

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

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 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.order.entity.api.guoren.constants.GuoRenRiskCode;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.guoren.GuoRenSpecialAgreementVo;
 import lombok.Data;
@@ -28,7 +28,6 @@ public class InsuranceSlipReq {
 
     @JsonProperty(value = "prpTinsured")
     @JSONField(name = "prpTinsured")
-
     private PrpTinsuredDTO prpTinsured;
 
     @JsonProperty(value = "biPrptenages")
@@ -42,6 +41,11 @@ public class InsuranceSlipReq {
     @JsonProperty(value = "order")
     @JSONField(name = "order")
     private String order;
+
+    @JsonProperty(value = "ocrOrder")
+    @JSONField(name = "ocrOrder")
+    private OcrOrderDTO ocrOrderDTO;
+
     /**
      * 构造请求参数
      */
@@ -107,6 +111,10 @@ public class InsuranceSlipReq {
 
         req.setBiPrptenages(biPrptenages);
         req.setCiPrptenages(ciPrptenages);
+
+        OcrOrderDTO orderDTO = new OcrOrderDTO(yaQuoteInfoVo);
+        req.setOcrOrderDTO(orderDTO);
+
         return req;
 
     }
@@ -182,4 +190,129 @@ public class InsuranceSlipReq {
         private String insuredIDValidDate;
     }
 
+
+    @NoArgsConstructor
+    @Data
+    public static class OcrOrderDTO {
+
+        @JsonProperty(value = "ocrCarOwner")
+        @JSONField(name = "ocrCarOwner")
+        private String ocrCarOwner;
+        @JsonProperty(value = "ocrCarOwnerIdentifyNumber")
+        @JSONField(name = "ocrCarOwnerIdentifyNumber")
+        private String ocrCarOwnerIdentifyNumber;
+        @JsonProperty(value = "ocrCarAddress")
+        @JSONField(name = "ocrCarAddress")
+        private String ocrCarAddress;
+        @JsonProperty(value = "ocrIdvalidStartDate")
+        @JSONField(name = "ocrIdvalidStartDate")
+        private String ocrIdvalidStartDate;
+        @JsonProperty(value = "ocrIdvalidDate")
+        @JSONField(name = "ocrIdvalidDate")
+        private String ocrIdvalidDate;
+
+        @JsonProperty(value = "ocrInsuredName")
+        @JSONField(name = "ocrInsuredName")
+        private String ocrInsuredName;
+        @JsonProperty(value = "ocrInsuredIdentifyNumber")
+        @JSONField(name = "ocrInsuredIdentifyNumber")
+        private String ocrInsuredIdentifyNumber;
+        @JsonProperty(value = "ocrInsuredAddress")
+        @JSONField(name = "ocrInsuredAddress")
+        private String ocrInsuredAddress;
+        @JsonProperty(value = "ocrInsuredIDValidStartDate")
+        @JSONField(name = "ocrInsuredIDValidStartDate")
+        private String ocrInsuredIDValidStartDate;
+        @JsonProperty(value = "ocrInsuredIDValidDate")
+        @JSONField(name = "ocrInsuredIDValidDate")
+        private String ocrInsuredIDValidDate;
+        @JsonProperty(value = "ocrAppliName")
+        @JSONField(name = "ocrAppliName")
+        private String ocrAppliName;
+        @JsonProperty(value = "ocrAppliIdentifyNumber")
+        @JSONField(name = "ocrAppliIdentifyNumber")
+        private String ocrAppliIdentifyNumber;
+        @JsonProperty(value = "ocrAppliAddress")
+        @JSONField(name = "ocrAppliAddress")
+        private String ocrAppliAddress;
+        @JsonProperty(value = "ocrAppliIDValidStartDate")
+        @JSONField(name = "ocrAppliIDValidStartDate")
+        private String ocrAppliIDValidStartDate;
+        @JsonProperty(value = "ocrAppliIDValidDate")
+        @JSONField(name = "ocrAppliIDValidDate")
+        private String ocrAppliIDValidDate;
+        @JsonProperty(value = "ocrOwnerAddress")
+        @JSONField(name = "ocrOwnerAddress")
+        private String ocrOwnerAddress;
+        @JsonProperty(value = "ocrVinNo")
+        @JSONField(name = "ocrVinNo")
+        private String ocrVinNo;
+        @JsonProperty(value = "ocrEngineNo")
+        @JSONField(name = "ocrEngineNo")
+        private String ocrEngineNo;
+        @JsonProperty(value = "ocrEnrolLDate")
+        @JSONField(name = "ocrEnrolLDate")
+        private String ocrEnrolLDate;
+        @JsonProperty(value = "ocrChgOwnerDate")
+        @JSONField(name = "ocrChgOwnerDate")
+        private String ocrChgOwnerDate;
+        @JsonProperty(value = "ocrModelName")
+        @JSONField(name = "ocrModelName")
+        private String ocrModelName;
+        @JsonProperty(value = "ocrUseYears")
+        @JSONField(name = "ocrUseYears")
+        private String ocrUseYears;
+        @JsonProperty(value = "ocrUseNatureCode")
+        @JSONField(name = "ocrUseNatureCode")
+        private String ocrUseNatureCode;
+        @JsonProperty(value = "ocrMaincarKindCode")
+        @JSONField(name = "ocrMaincarKindCode")
+        private String ocrMaincarKindCode;
+        @JsonProperty(value = "ocrCarKindCode")
+        @JSONField(name = "ocrCarKindCode")
+        private String ocrCarKindCode;
+        @JsonProperty(value = "ocrLicenseCategory")
+        @JSONField(name = "ocrLicenseCategory")
+        private String ocrLicenseCategory;
+        @JsonProperty(value = "ocrLicenseKindCode")
+        @JSONField(name = "ocrLicenseKindCode")
+        private String ocrLicenseKindCode;
+
+
+        public OcrOrderDTO(BaseQuoteInfoVo yaQuoteInfoVo) {
+            // 车主
+            CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
+            // 被保人
+            CustomerInfoVo insuredPersonInfo = yaQuoteInfoVo.getInsuredPersonInfo();
+            // 投保人信息
+            CustomerInfoVo policyHolderInfo = yaQuoteInfoVo.getPolicyHolderInfo();
+            // 车辆信息
+            CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
+
+            this.ocrCarOwner = ownerInfo.getName();
+            this.ocrCarOwnerIdentifyNumber = ownerInfo.getIdentifyNumber();
+            this.ocrCarAddress = ownerInfo.getAddr();
+            this.ocrIdvalidStartDate = ownerInfo.getIdentifyValidDate();
+            this.ocrIdvalidDate = ownerInfo.getIdentifyValidEndDate();
+
+            this.ocrInsuredName = insuredPersonInfo.getName();
+            this.ocrInsuredIdentifyNumber = insuredPersonInfo.getIdentifyNumber();
+            this.ocrInsuredAddress = insuredPersonInfo.getAddr();
+            this.ocrInsuredIDValidStartDate = insuredPersonInfo.getIdentifyValidDate();
+            this.ocrInsuredIDValidDate = insuredPersonInfo.getIdentifyValidEndDate();
+
+            this.ocrAppliName = policyHolderInfo.getName();
+            this.ocrAppliIdentifyNumber = policyHolderInfo.getIdentifyNumber();
+            this.ocrAppliAddress = policyHolderInfo.getAddr();
+            this.ocrAppliIDValidStartDate = policyHolderInfo.getIdentifyValidDate();
+            this.ocrAppliIDValidDate = policyHolderInfo.getIdentifyValidEndDate();
+
+            this.ocrVinNo = carInfo.getFrameNo();
+            this.ocrEngineNo = carInfo.getEngineNo();
+            this.ocrEnrolLDate = carInfo.getRegisterDate();
+            this.ocrChgOwnerDate = carInfo.getIssueDate();
+
+        }
+    }
+
 }