修改转续保查询问题

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

@@ -1,25 +0,0 @@
-package com.ydtech.modules.order.convert;
-
-import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Map;
-
-@Mapper
-public interface MapToYaExtendInfoDto {
-
-    MapToYaExtendInfoDto INSTANCE = Mappers.getMapper(MapToYaExtendInfoDto.class);
-
-
-    @Mapping(target = "nirrratio", expression = "java(map.get(\"nirrratio\"))")
-    @Mapping(target = "nirrratioCI", expression = "java(map.get(\"nirrratioCI\"))")
-    @Mapping(target = "pricingAdjustValue", expression = "java(map.get(\"pricingAdjustValue\"))")
-    @Mapping(target = "jqFeeSaleChangeRateA4", expression = "java(map.get(\"jqFeeSaleChangeRateA4\"))")
-    @Mapping(target = "syFeeSaleChangeRateA4", expression = "java(map.get(\"syFeeSaleChangeRateA4\"))")
-    @Mapping(target = "deepPriceGradeBI", expression = "java(map.get(\"deepPriceGradeBI\"))")
-    @Mapping(target = "deepPriceGradeCI", expression = "java(map.get(\"deepPriceGradeCI\"))")
-    YaExtendInfoDto mapToYaExtendInfoDto(Map<String, String> map);
-
-}

src/main/java/com/ydtech/modules/order/entity/vo/ya/YaExtendInfoDto.java

@@ -5,9 +5,12 @@ import com.ydtech.modules.order.entity.InsAreaCompany;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Map;
 
+@NoArgsConstructor
 @Data
 @ApiModel("永安扩展字段")
 public class YaExtendInfoDto implements Serializable {
@@ -90,6 +93,17 @@ public class YaExtendInfoDto implements Serializable {
     private String accidentInfoStr;
 
 
+    public YaExtendInfoDto(Map<String, String> map) {
+        this.nirrratio = map.get("nirrratio");
+        this.nirrratioCI = map.get("nirrratioCI");
+        this.pricingAdjustValue = map.get("pricingAdjustValue");
+        this.jqFeeSaleChangeRateA4 = map.get("jqFeeSaleChangeRateA4");
+        this.syFeeSaleChangeRateA4 = map.get("syFeeSaleChangeRateA4");
+        this.deepPriceGradeBI = map.get("deepPriceGradeBI");
+        this.deepPriceGradeCI = map.get("deepPriceGradeCI");
+    }
+
+
     public void setInsAreaCompany(InsAreaCompany insAreaCompany) {
         //保费因素
         this.accidentInfoStr = insAreaCompany.getAccidentStrInfo();

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

@@ -43,7 +43,6 @@ import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.ExtendInfoDto;
 import com.ydtech.modules.ins.model.ya.ResponseDataC2;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
-import com.ydtech.modules.order.convert.MapToYaExtendInfoDto;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
@@ -577,7 +576,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             Map<String, String> stringStringMap = extendInfoDtos.stream().collect(LinkedHashMap::new,
                     (m, v) -> m.put(v.getKey(),
                             v.getValue()), LinkedHashMap::putAll);
-            yaExtendInfoDto = MapToYaExtendInfoDto.INSTANCE.mapToYaExtendInfoDto(stringStringMap);
+            yaExtendInfoDto = new YaExtendInfoDto(stringStringMap);
             orderAndAreaCompany.setExtendInfo(yaExtendInfoDto);
         }
         InsAreaCompany iac = insAreaCompanyService.getById(companyId);
@@ -885,7 +884,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             Map<String, String> stringStringMap = extendInfoDtos.stream().collect(LinkedHashMap::new,
                     (m, v) -> m.put(v.getKey(),
                             v.getValue()), LinkedHashMap::putAll);
-            yaExtendInfoDto = MapToYaExtendInfoDto.INSTANCE.mapToYaExtendInfoDto(stringStringMap);
+            yaExtendInfoDto = new YaExtendInfoDto(stringStringMap);
             orderAndAreaCompany.setExtendInfo(yaExtendInfoDto);
         }
         InsAreaCompany iac = insAreaCompanyService.getById(companyId);

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

@@ -15,7 +15,6 @@ import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.InsImagesUploadCacheComponents;
-import com.ydtech.modules.order.convert.MapToYaExtendInfoDto;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
@@ -328,7 +327,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             List<ExtendInfoDto> extendInfoDtos = responseBodyC2.getExtendInfo();
             Map<String, String> stringStringMap = extendInfoDtos.stream().collect(LinkedHashMap::new, (m, v) -> m.put(v.getKey(),
                     v.getValue()), LinkedHashMap::putAll);
-            YaExtendInfoDto yaExtendInfoDto = MapToYaExtendInfoDto.INSTANCE.mapToYaExtendInfoDto(stringStringMap);
+            YaExtendInfoDto yaExtendInfoDto = new YaExtendInfoDto(stringStringMap);
             String orderNo = quoteInfoVo.getOrderNo();
             QuoteRespVo quoteRespVo = getQuoteRespVo(orderNo, carDTO, responseBodyC2);
             quoteRespVo.setExtendInfo(yaExtendInfoDto);