修改能源类型

src/main/java/com/ydtech/modules/order/convert/SimpleStadarCarDTOConvert.java

@@ -1,33 +0,0 @@
-package com.ydtech.modules.order.convert;
-
-import com.ydtech.modules.ins.model.ya.CarModelDTO;
-import com.ydtech.modules.order.entity.api.zhongmei.response.ModelsQueryResponse;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper
-public interface SimpleStadarCarDTOConvert {
-
-
-    SimpleStadarCarDTOConvert INSTANCE = Mappers.getMapper(SimpleStadarCarDTOConvert.class);
-
-    List<CarModelDTO> map(List<ModelsQueryResponse.SimpleStadarCarDTO> zmCarModels);
-
-    @Mapping(source = "localModelCode", target = "modelCode")
-    @Mapping(source = "modelName", target = "modelName")
-    @Mapping(source = "brand", target = "brandCN")
-    @Mapping(source = "series", target = "series")
-    @Mapping(source = "approvedPassengersCapacity", target = "ratedPassengerCapacity")
-    @Mapping(source = "displacement", target = "displacement")
-    @Mapping(source = "lfDate", target = "marketYear")
-    @Mapping(source = "purchasePrice", target = "replacementValue")
-    @Mapping(source = "vehicleDescription", target = "remark")
-    @Mapping(source = "energyTypes", target = "fuelType")
-    @Mapping(source = "energyTypes", target = "energyTypes")
-    @Mapping(source = "power", target = "powerScale")
-    CarModelDTO zhongmeiCar2YonganCar(ModelsQueryResponse.SimpleStadarCarDTO renbaoCarModel);
-
-}

src/main/java/com/ydtech/modules/order/entity/api/zhongmei/response/ModelsQueryResponse.java

@@ -1,6 +1,8 @@
 package com.ydtech.modules.order.entity.api.zhongmei.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.constants.enums.JingyouEnergyTypes;
+import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.zm.ZmCarModel;
 import com.ydtech.modules.order.entity.api.zhongmei.BaseResponse;
 import com.ydtech.modules.order.entity.filter.CarModelsFilter;
@@ -166,6 +168,10 @@ public class ModelsQueryResponse extends BaseResponse {
         @JsonProperty("modelName")
         private String modelName;
 
+        @JsonProperty("fuelTypeCode")
+        private String fuelTypeCode;
+
+
         public CoreModelsVo toCoreModelsVo() {
             CoreModelsVo coreModelsVo = new CoreModelsVo();
             coreModelsVo.setModelCode(this.localModelCode);
@@ -178,6 +184,25 @@ public class ModelsQueryResponse extends BaseResponse {
             return coreModelsVo;
         }
 
+        public CarModelDTO toCarModelDTO() {
+            CarModelDTO carModelDTO = new CarModelDTO();
+            carModelDTO.setModelCode(this.localModelCode);
+            carModelDTO.setModelName(this.modelName);
+            carModelDTO.setBrandCN(this.brand);
+            carModelDTO.setSeries(this.series);
+            carModelDTO.setRatedPassengerCapacity(String.valueOf(this.approvedPassengersCapacity));
+            carModelDTO.setDisplacement(String.valueOf(this.displacement));
+            carModelDTO.setMarketYear(this.lfDate);
+            carModelDTO.setReplacementValue(this.purchasePrice);
+            carModelDTO.setRemark(this.vehicleDescription);
+            carModelDTO.setFuelType(this.energyTypes);
+            String energyTypeByCode = JingyouEnergyTypes.getEnergyTypeByCode(this.getFuelTypeCode());
+            carModelDTO.setFuelTypeCode(energyTypeByCode);
+            carModelDTO.setEnergyTypes(this.energyTypes);
+            carModelDTO.setPowerScale(String.valueOf(this.power));
+            return carModelDTO;
+        }
+
 
         public SimpleStadarCarDTO(ZmCarModel zmCarInfoVO) {
             this.approvedLoad = Double.parseDouble(zmCarInfoVO.getApprovedLoad());

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

@@ -18,7 +18,6 @@ import com.ydtech.modules.order.components.InsImagesUploadCacheComponents;
 import com.ydtech.modules.order.components.ZhongmeiRequestApiComponents;
 import com.ydtech.modules.order.components.zhongmei.ZhongmeiRepeatInsuranceComponents;
 import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
-import com.ydtech.modules.order.convert.SimpleStadarCarDTOConvert;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
@@ -143,12 +142,9 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         }
         ModelsQueryRequest modelsQueryResponse = new ModelsQueryRequest();
         modelsQueryResponse.setModelName(modelName);
-//        List<ModelsQueryResponse.SimpleStadarCarDTO> car = zhongmeiRequestApiComponents.modelQuery(modelsQueryResponse,
-//        ModelsQueryResponse.class);
         List<ModelsQueryResponse.SimpleStadarCarDTO> car = new ArrayList<>();
         modelInquiry(modelName, car);
-
-        List<CarModelDTO> map = SimpleStadarCarDTOConvert.INSTANCE.map(car);
+        List<CarModelDTO> map = car.stream().map(ModelsQueryResponse.SimpleStadarCarDTO::toCarModelDTO).collect(Collectors.toList());
 
         //数据存储到缓存中
         if (!map.isEmpty()) {