修改

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Ruote.java

@@ -156,7 +156,7 @@ public class Ruote {
      * @date: 2023年02月08日 0008
      */
     public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, YcConfigureParameters ycConfigureParameters,
-                                        AccidentalDrivingVo adVo, ModelsQueryResponse.VehicleInfo vehicleInfo) {
+                                        AccidentalDrivingVo adVo) {
 
         Ruote m = new Ruote();
         Ruote.RequestLabel requestLabel = new Ruote.RequestLabel();
@@ -181,7 +181,7 @@ public class Ruote {
          * 车辆信息
          * 代码：vhl
          */
-        Vhl vhl = Vhl.buildVhl(carInfo, ownerInfo, vehicleInfo);
+        Vhl vhl = Vhl.buildVhl(carInfo, ownerInfo);
 
         String startTime = StringUtils.isNotEmpty(base.getTInsrncBgnTmJQ()) ? base.getTInsrncBgnTmJQ() : base.getTInsrncBgnTmSY();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Vhl.java

@@ -331,14 +331,22 @@ public class Vhl {
     /**
      * @description: 车辆信息
      */
-    public static Vhl buildVhl(CarInfoVo carInfo, CustomerInfoVo ownerInfo, ModelsQueryResponse.VehicleInfo vehicleInfo) {
+    public static Vhl buildVhl(CarInfoVo carInfo, CustomerInfoVo ownerInfo) {
         Vhl vhl = new Vhl();
-        vhl.setCPlateModelCde(vehicleInfo.getVehicleId());
-        vhl.setCModelCde(carInfo.getModelCode());
 
+        //        //3 车辆信息
+//        CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
+//
+//        //2.2车主
+//        CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
+
+        vhl.setCPlateModelCde(carInfo.getCiModelCode());
+        vhl.setCModelCde(carInfo.getModelCode());
         vhl.setCRegOwner(ownerInfo.getName());
         vhl.setCPlateNo(carInfo.getLicenseNo());
-        vhl.setCModelNme(vehicleInfo.getVehicleName());
+//      <CModelNme>威志CA7150BUE5S轿车</CModelNme>
+        vhl.setCModelNme(carInfo.getModelcname());
+
         LocalDate lDate = LocalDate.parse(carInfo.getRegisterDate());
         LocalDate newlDate = LocalDate.now();
         int years = newlDate.getYear() - lDate.getYear();

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

@@ -143,7 +143,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     private final InsImagesUploadCacheComponents insImagesUploadCacheComponents;
 
-    public ModelsQueryResponse.VehicleInfo gainVehicleModel(YcConfigureParameters ycConfigureParameters, CarInfoVo carInfo) {
+    public void gainVehicleModel(YcConfigureParameters ycConfigureParameters, CarInfoVo carInfo) {
         CarModel_Req carModelReq = new CarModel_Req();
         carModelReq.setFrameNo(carInfo.getFrameNo());
         carModelReq.setEngineNo(carInfo.getEngineNo());
@@ -153,7 +153,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
         try {
             rd = yongchengRequestApiComponents.newQueryVehicleTypes(m);
-            rd.setVehicleInfoList(new ArrayList<>());
         } catch (IOException e) {
             throw new SystemException("车型查询接口异常，请联系管理。");
         }
@@ -184,14 +183,16 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                     rd.getVehicleInfoList().stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).collect(Collectors.toList());
 
             if (CollUtil.isNotEmpty(vehicleInfoList)) {
-                return vehicleInfoList.get(0);
+                buildCarInfo(carInfo, vehicleInfoList.get(0));
+                return;
             }
 
             //金额升序
             vehicleInfoList =
                     rd.getVehicleInfoList().stream().sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice)).collect(Collectors.toList());
 
-            return vehicleInfoList.get(0);
+            buildCarInfo(carInfo, vehicleInfoList.get(0));
+            return;
         }
 
         //匹配的车辆信息数据
@@ -199,7 +200,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                 vehicleInfoList.stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).findFirst().orElse(null);
 
         if (null != matchVehicleInfo) {
-            return matchVehicleInfo;
+            buildCarInfo(carInfo, matchVehicleInfo);
+            return;
         }
 
         //匹配的车辆信息数据里  未匹配成功   默认选择第一条
@@ -207,9 +209,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         vehicleInfoList =
                 vehicleInfoList.stream().sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehicleYear).thenComparing((o1,
                                                                                                                                      o2) -> Integer.compare(StringUtils.toInt(o2.getVehiclePrice()), StringUtils.toInt(o1.getVehiclePrice()))).reversed()).collect(Collectors.toList());
-
-
-        return vehicleInfoList.get(0);
+        buildCarInfo(carInfo, vehicleInfoList.get(0));
 
     }
 
@@ -227,11 +227,11 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
 
         //构造车辆信息
-        ModelsQueryResponse.VehicleInfo vehicleInfo = gainVehicleModel(ycConfigureParameters, carInfo);
+        gainVehicleModel(ycConfigureParameters, carInfo);
         AccidentalDrivingVo adVo = quoteVo.getAccidentalDrivingVo();
 
         //组装参数
-        Ruote m = Ruote.buildQuoteParam(yaQuoteInfoVo, ycConfigureParameters, adVo, vehicleInfo);
+        Ruote m = Ruote.buildQuoteParam(yaQuoteInfoVo, ycConfigureParameters, adVo);
         //构造地区
         buildRegion(m, yaQuoteInfoVo);
         return m;
@@ -1315,6 +1315,12 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         return FileUtil.netUrlToFile(url, dir, fileName, uploadFilePath, apiUrl + showFileUrl);
     }
 
+    private void buildCarInfo(CarInfoVo carInfo, ModelsQueryResponse.VehicleInfo vehicleInfo) {
+        carInfo.setModelCode(vehicleInfo.getVehicleId());
+        carInfo.setCiCarName(vehicleInfo.getVehicleName());
+        carInfo.setModelcname(vehicleInfo.getVehicleName());
+//        carInfo.setSeatCount(vehicleInfo.getVehicleSeat());
 
+    }
 
 }