大家 华泰 修改排量0错误情况

src/main/java/com/ydtech/modules/order/entity/api/dajia/constants/COwnerCls.java

@@ -0,0 +1,17 @@
+package com.ydtech.modules.order.entity.api.dajia.constants;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum COwnerCls {
+    CLS1(1,"个人"),
+    CLS2(2,"机关"),
+    CLS3(3,"企业");
+
+    private final Integer code;
+
+    private final String desc;
+
+}

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

@@ -481,7 +481,7 @@ public class ODR1008Request extends DaJiaBaseRequest {
         //车主姓名
         vehicleOwnerInfoDTO.setVehicleOwnerCOwnerNme(quoteInfoVo.getOwnerInfo().getName());
         //车主类型
-        vehicleOwnerInfoDTO.setVehicleOwnerCOwnerCls(1);
+        vehicleOwnerInfoDTO.setVehicleOwnerCOwnerCls(COwnerCls.CLS1.getCode());
         //邮编
         vehicleOwnerInfoDTO.setVehicleOwnerCZipCde("030024");
         //车主出生日期
@@ -726,9 +726,9 @@ public class ODR1008Request extends DaJiaBaseRequest {
         //车型名称
         vehicleInfoDTO.setVehicleModelNme(resultDTO.getVehicleName());
         //排气量
-        if ("0".equals(resultDTO.getVehicleExhaust()) && "0".equals(resultDTO.getCfuelType())) {
-            //如果排量为空，则默认为1.0
-            vehicleInfoDTO.setVehicleNDisplacement("1.0");
+        if ((null == resultDTO.getVehicleExhaust() || "0".equals(resultDTO.getVehicleExhaust())) && (null == resultDTO.getCfuelType() || "0".equals(resultDTO.getCfuelType()))) {
+            //如果排量为空，则获取前台的传值
+            vehicleInfoDTO.setVehicleNDisplacement(quoteInfoVo.getCarInfo().getExhaustScale());
         } else {
             vehicleInfoDTO.setVehicleNDisplacement(resultDTO.getVehicleExhaust());
         }

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiQuotedPriceRequest.java

@@ -291,7 +291,12 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
 
                 public PolicyCarDto(CarInfoVo carInfoVo, HuaTaiModelsQueryResponse.CarModelDto.FullCarDataDto fullCarDataDto) {
                     this.approvedPassengersCapacity = Integer.parseInt(carInfoVo.getSeatCount());
-                    this.displacement = fullCarDataDto.getDisplacement();
+                    if(fullCarDataDto.getDisplacement() != 0) {
+                        this.displacement = Double.parseDouble(carInfoVo.getDisplacement());
+                    }else{
+                        this.displacement = Double.parseDouble(carInfoVo.getExhaustScale());
+                    }
+//                    this.displacement = fullCarDataDto.getDisplacement();
                     this.plateNo = carInfoVo.getLicenseNo();
                     this.registerDate = carInfoVo.getRegisterDate() + " " + TimeConstants.START_TIME;
                     this.issueDate = carInfoVo.getIssueDate() + " " + TimeConstants.START_TIME;