企业级字段新增

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

@@ -29,9 +29,14 @@ public class CustomerInfoVo {
     private String name;
 
     @NotNull(message = "车主、投保人、被保人身份证号不能为空")
+    @CheckIdentifyNumber
     @ApiModelProperty("身份证号")
     private String identifyNumber;
 
+    @NotNull(message = "（企业）车主、投保人、被保人组织机构代码不能为空")
+    @ApiModelProperty("组织机构代码")
+    private String organizationCode;
+
 //    @NotNull(message = "车主、投保人、被保人身份证类型不能为空")
     @ApiModelProperty("身份证类型")
     private String identifyType;

src/main/java/com/ydtech/modules/order/entity/api/chengtai/request/InsurePremiumRequest.java

@@ -56,11 +56,10 @@ public class InsurePremiumRequest extends ChengTaiBaseRequest{
                                 QueryCarActualValueResponse carActualValueResponse,
                                 PersonAreaVo personAreaVo,
                                 ChengTaiConfigureParameters parameters,
-                                BaseQuoteVo<InsDrivingIntentionInsurance> quoteVo,
-                                CarInfoResponse.CarModelListDTO modelListDTO){
+                                BaseQuoteVo<InsDrivingIntentionInsurance> quoteVo){
         super(parameters.getPartnerCode());
         // 标的信息
-        InsuredObjectDTO insuredObject = new InsuredObjectDTO(quoteInfoVo, carModelListDTO,carActualValueResponse, modelListDTO);
+        InsuredObjectDTO insuredObject = new InsuredObjectDTO(quoteInfoVo, carModelListDTO,carActualValueResponse);
         this.insuredObject = insuredObject;
         // 客户信息
         OwnerDTO owner = new OwnerDTO(quoteInfoVo.getOwnerInfo(), personAreaVo);
@@ -419,8 +418,8 @@ public class InsurePremiumRequest extends ChengTaiBaseRequest{
 
         public InsuredObjectDTO(BaseQuoteInfoVo quoteInfoVo,
                                 CarInfoResponse.CarModelListDTO carModelListDTO,
-                                QueryCarActualValueResponse carActualValueResponse, CarInfoResponse.CarModelListDTO modelListDTO){
-            PolicyCarDTO policyCarDTO = new PolicyCarDTO(quoteInfoVo, carModelListDTO,carActualValueResponse,modelListDTO);
+                                QueryCarActualValueResponse carActualValueResponse){
+            PolicyCarDTO policyCarDTO = new PolicyCarDTO(quoteInfoVo, carModelListDTO,carActualValueResponse);
             this.policyCar = policyCarDTO;
 
             // 修理厂信息
@@ -510,8 +509,7 @@ public class InsurePremiumRequest extends ChengTaiBaseRequest{
 
             public PolicyCarDTO(BaseQuoteInfoVo quoteInfoVo,
                                 CarInfoResponse.CarModelListDTO carModelListDTO,
-                                QueryCarActualValueResponse carActualValueResponse,
-                                CarInfoResponse.CarModelListDTO modelListDTO){
+                                QueryCarActualValueResponse carActualValueResponse){
                 CarInfoVo carInfo = quoteInfoVo.getCarInfo();
                 this.vin = carInfo.getFrameNo();
                 this.engine = carInfo.getEngineNo();
@@ -554,14 +552,14 @@ public class InsurePremiumRequest extends ChengTaiBaseRequest{
                 this.carCheckStatus = "3";
                 this.carCheckReason = "1";
                 this.carCheckReasonName = "按期续保未增保损失险类";
-                if (Objects.isNull(modelListDTO.getDisplacement())){
+                if (Objects.isNull(carModelListDTO.getDisplacement())){
                     if(StringUtils.isBlank(carInfo.getEnginedesc())){
                         this.displacement = new BigDecimal(1);
                     }else{
                         this.displacement = new BigDecimal(carInfo.getEnginedesc()).multiply(new BigDecimal("1000"));
                     }
                 }else{
-                    this.displacement = modelListDTO.getDisplacement().multiply(new BigDecimal("1000"));
+                    this.displacement = carModelListDTO.getDisplacement().multiply(new BigDecimal("1000"));
                 }
                 this.exhaustScaleUnit = "ml";
                 this.approvedLoad = StringUtils.isBlank(carInfo.getLimitLoad()) ? new BigDecimal(0) : new BigDecimal(carInfo.getLimitLoad());

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

@@ -123,7 +123,7 @@ public class ChengTaiOrderApiServiceImpl implements ChengTaiOrderApiService {
         /** 4. 报价 */
         PersonAreaVo personAreaVo = new PersonAreaVo();
         buildRegion(quoteInfoVo,personAreaVo);
-        InsurePremiumRequest insurePremiumRequest = new InsurePremiumRequest(quoteInfoVo,carModelListDTO, carActualValueResponse,personAreaVo,parameters,quoteVo, carModelListDTO);
+        InsurePremiumRequest insurePremiumRequest = new InsurePremiumRequest(quoteInfoVo,carModelListDTO, carActualValueResponse,personAreaVo,parameters,quoteVo);
 
         // 重复报价
         InsurePremiumResponse insurePremiumResponse = this.getResponse(insurePremiumRequest, httpHeaders);
@@ -163,7 +163,7 @@ public class ChengTaiOrderApiServiceImpl implements ChengTaiOrderApiService {
     }
 
     /**
-     * 递归报价
+     * 重复报价
      * @param insurePremiumRequest
      * @param httpHeaders
      * @return