验车码

src/main/java/com/ydtech/modules/esm/controller/EsmInsVehicleInspectionCodeController.java

@@ -0,0 +1,65 @@
+package com.ydtech.modules.esm.controller;
+
+
+import com.ydtech.aop.request.RequestSingleParam;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.esm.model.EsmInsVehicleInspectionCode;
+import com.ydtech.modules.esm.model.vo.EsmInsVehicleInspectionCodePageVo;
+import com.ydtech.modules.esm.model.vo.EsmInsVehicleInspectionCodeVo;
+import com.ydtech.modules.esm.service.EsmInsVehicleInspectionCodeService;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "保险公司验车码")
+@RestController
+@RequestMapping("/esmInsVehicleInspectionCode")
+@RequiredArgsConstructor
+public class EsmInsVehicleInspectionCodeController {
+
+    private final EsmInsVehicleInspectionCodeService esmInsVehicleInspectionCodeService;
+
+    @PostMapping("/display")
+    @ApiOperation("验车码显示")
+    public HttpResult<List<EsmInsVehicleInspectionCode>> display() {
+        List<EsmInsVehicleInspectionCode> esmInsVehicleInspectionCodes= esmInsVehicleInspectionCodeService.display();
+        return HttpResult.ok(esmInsVehicleInspectionCodes);
+    }
+
+    @PostMapping("/query")
+    @ApiOperation("查询")
+    public HttpResult<BasePageResult<EsmInsVehicleInspectionCode>> queryPage(EsmInsVehicleInspectionCodePageVo esmInsVehicleInspectionCodePageVo) {
+        BasePageResult<EsmInsVehicleInspectionCode> esmInsVehicleInspectionCodeBasePageResult= esmInsVehicleInspectionCodeService.queryPage(esmInsVehicleInspectionCodePageVo);
+        return HttpResult.ok(esmInsVehicleInspectionCodeBasePageResult);
+    }
+
+    @PostMapping("/submit")
+    @ApiOperation("提交")
+    public HttpResult<Object> submit(EsmInsVehicleInspectionCodeVo esmInsVehicleInspectionCodeVo) {
+        boolean b = esmInsVehicleInspectionCodeService.submit(esmInsVehicleInspectionCodeVo);
+        AssertionUtils.isSucceed(b, "提交失败");
+        return HttpResult.ok("提交成功");
+    }
+
+    @DeleteMapping("/modification/{id}")
+    @ApiOperation("修改")
+    public HttpResult<Object> modification(@PathVariable String id, @RequestSingleParam("code") String code) {
+        boolean b = esmInsVehicleInspectionCodeService.modification(id, code);
+        AssertionUtils.isSucceed(b, "修改失败");
+        return HttpResult.ok("修改成功");
+    }
+
+    @DeleteMapping("/remove/{id}")
+    @ApiOperation("删除")
+    public HttpResult<Object> remove(@PathVariable String id) {
+        boolean b = esmInsVehicleInspectionCodeService.removeById(id);
+        AssertionUtils.isSucceed(b, "删除失败");
+        return HttpResult.ok("删除成功");
+    }
+
+}

src/main/java/com/ydtech/modules/esm/dao/EsmInsVehicleInspectionCodeMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.esm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.esm.model.EsmInsVehicleInspectionCode;
+
+/**
+* @author Administrator
+* @description 针对表【esm_ins_vehicle_inspection_code(验车码维护表)】的数据库操作Mapper
+* @createDate 2023-12-29 15:00:30
+* @Entity generator.domain.EsmInsVehicleInspectionCode
+*/
+public interface EsmInsVehicleInspectionCodeMapper extends BaseMapper<EsmInsVehicleInspectionCode> {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/esm/model/EsmInsVehicleInspectionCode.java

@@ -0,0 +1,50 @@
+package com.ydtech.modules.esm.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 验车码维护表
+ * @TableName esm_ins_vehicle_inspection_code
+ */
+@TableName(value ="esm_ins_vehicle_inspection_code")
+@Data
+public class EsmInsVehicleInspectionCode implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Integer id;
+
+    /**
+     * 保险公司id
+     */
+    @TableField(value = "company_id")
+    private String companyId;
+
+    /**
+     * 保险公司名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 验车码
+     */
+    @TableField(value = "vehicle_inspection_code")
+    private String vehicleInspectionCode;
+
+    /**
+     * 有效时间
+     */
+    @TableField(value = "valid_time")
+    private Date validTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/ydtech/modules/esm/model/vo/EsmInsVehicleInspectionCodePageVo.java

@@ -0,0 +1,24 @@
+package com.ydtech.modules.esm.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+@Data
+public class EsmInsVehicleInspectionCodePageVo implements Serializable {
+
+    private static final long serialVersionUID = -1747432623058279115L;
+
+    @ApiModelProperty(value = "每页页数")
+    @Min(value = 20, message = "页数最小为20")
+    @Max(value = 100, message = "页数最大为100")
+    private int pageSize;
+
+    @ApiModelProperty(value = "页数")
+    @Min(value = 1, message = "页数最小为1")
+    private int pageNum;
+
+}

src/main/java/com/ydtech/modules/esm/model/vo/EsmInsVehicleInspectionCodeVo.java

@@ -0,0 +1,23 @@
+package com.ydtech.modules.esm.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@ApiModel("验车码")
+@Data
+public class EsmInsVehicleInspectionCodeVo implements Serializable {
+
+    private static final long serialVersionUID = -2664896133458891763L;
+
+
+    @ApiModelProperty("保险公司id")
+    private String companyId;
+
+    @ApiModelProperty("验车码")
+    private String vehicleInspectionCode;
+
+}

src/main/java/com/ydtech/modules/esm/service/EsmInsVehicleInspectionCodeService.java

@@ -0,0 +1,53 @@
+package com.ydtech.modules.esm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.esm.model.EsmInsVehicleInspectionCode;
+import com.ydtech.modules.esm.model.vo.EsmInsVehicleInspectionCodePageVo;
+import com.ydtech.modules.esm.model.vo.EsmInsVehicleInspectionCodeVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description 针对表【esm_ins_vehicle_inspection_code(验车码维护表)】的数据库操作Service
+ * @createDate 2023-12-29 15:00:30
+ */
+public interface EsmInsVehicleInspectionCodeService extends IService<EsmInsVehicleInspectionCode> {
+
+    /**
+     * 显示
+     *
+     * @return
+     */
+    List<EsmInsVehicleInspectionCode> display();
+
+
+    /**
+     * 分页查询
+     *
+     * @param esmInsVehicleInspectionCodePageVo
+     * @return
+     */
+    BasePageResult<EsmInsVehicleInspectionCode> queryPage(EsmInsVehicleInspectionCodePageVo esmInsVehicleInspectionCodePageVo);
+
+    /**
+     * 提交数据
+     *
+     * @param esmInsVehicleInspectionCodeVo 验证码数据
+     * @return 成功 失败
+     */
+    boolean submit(EsmInsVehicleInspectionCodeVo esmInsVehicleInspectionCodeVo);
+
+
+    /**
+     * 修改数据
+     *
+     * @param id   id
+     * @param code 验车码
+     * @return 成功 失败
+     */
+    boolean modification(String id, String code);
+
+
+}

src/main/java/com/ydtech/modules/esm/service/impl/EsmInsVehicleInspectionCodeServiceImpl.java

@@ -0,0 +1,77 @@
+package com.ydtech.modules.esm.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.esm.dao.EsmInsVehicleInspectionCodeMapper;
+import com.ydtech.modules.esm.model.EsmInsCompany;
+import com.ydtech.modules.esm.model.EsmInsVehicleInspectionCode;
+import com.ydtech.modules.esm.model.vo.EsmInsVehicleInspectionCodePageVo;
+import com.ydtech.modules.esm.model.vo.EsmInsVehicleInspectionCodeVo;
+import com.ydtech.modules.esm.service.EsmInsCompanyService;
+import com.ydtech.modules.esm.service.EsmInsVehicleInspectionCodeService;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description 针对表【esm_ins_vehicle_inspection_code(验车码维护表)】的数据库操作Service实现
+ * @createDate 2023-12-29 15:00:30
+ */
+@Service
+@RequiredArgsConstructor
+public class EsmInsVehicleInspectionCodeServiceImpl extends ServiceImpl<EsmInsVehicleInspectionCodeMapper, EsmInsVehicleInspectionCode>
+        implements EsmInsVehicleInspectionCodeService {
+
+    private final EsmInsCompanyService esmInsCompanyService;
+
+    @Override
+    public List<EsmInsVehicleInspectionCode> display() {
+        return lambdaQuery().likeRight(EsmInsVehicleInspectionCode::getValidTime, LocalDate.now().toString()).list();
+    }
+
+    @Override
+    public BasePageResult<EsmInsVehicleInspectionCode> queryPage(EsmInsVehicleInspectionCodePageVo esmInsVehicleInspectionCodePageVo) {
+        Page<EsmInsVehicleInspectionCode> page = new Page<>(esmInsVehicleInspectionCodePageVo.getPageNum(),
+                esmInsVehicleInspectionCodePageVo.getPageSize());
+        Page<EsmInsVehicleInspectionCode> insOrdersPage = page(page, new QueryWrapper<>());
+        return new BasePageResult<>(esmInsVehicleInspectionCodePageVo.getPageNum(), page.getSize(), insOrdersPage.getTotal(),
+                page.getPages(), insOrdersPage.getRecords());
+    }
+
+    @Override
+    public boolean submit(EsmInsVehicleInspectionCodeVo esmInsVehicleInspectionCodeVo) {
+        EsmInsVehicleInspectionCode esmInsVehicleInspectionCode = lambdaQuery().eq(EsmInsVehicleInspectionCode::getCompanyId,
+                esmInsVehicleInspectionCodeVo.getCompanyId()).one();
+        AssertionUtils.isSucceed(ObjectUtils.isEmpty(esmInsVehicleInspectionCode), "此保险公司已经录入验车码");
+
+        EsmInsCompany esmInsCompany = esmInsCompanyService.getById(esmInsVehicleInspectionCodeVo.getCompanyId());
+        AssertionUtils.isSucceed(!ObjectUtils.isEmpty(esmInsCompany), "录入的保险公司不存在");
+
+        esmInsVehicleInspectionCode.setCompanyId(esmInsCompany.getId());
+        esmInsVehicleInspectionCode.setName(esmInsCompany.getName());
+        esmInsVehicleInspectionCode.setVehicleInspectionCode(esmInsVehicleInspectionCode.getVehicleInspectionCode());
+        return save(esmInsVehicleInspectionCode);
+    }
+
+    @Override
+    public boolean modification(String id, String code) {
+        EsmInsVehicleInspectionCode esmInsVehicleInspectionCode = this.baseMapper.selectById(id);
+        AssertionUtils.isEmpty(esmInsVehicleInspectionCode, "修改的编号不存在");
+
+        esmInsVehicleInspectionCode.setVehicleInspectionCode(code);
+        return updateById(esmInsVehicleInspectionCode);
+    }
+
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/ins/model/yc/modelsQuery/ModelsQueryResponse.java

@@ -21,8 +21,10 @@ public class ModelsQueryResponse {
 
     @JacksonXmlProperty(localName = "msg")
     private String msg;
+
     @JacksonXmlProperty(localName = "returnCode")
     private String returnCode;
+
     @JacksonXmlProperty(localName = "searchKeyword")
     private String searchKeyword;
 
@@ -30,6 +32,7 @@ public class ModelsQueryResponse {
     @JacksonXmlElementWrapper(useWrapping = false)
     @JacksonXmlProperty(localName = "vehicleInfo")
     private List<VehicleInfo> vehicleInfoList;
+
 //    @JacksonXmlElementWrapper
 //    @JacksonXmlProperty(localName = "S:Body")
 //    private Object body;

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

@@ -3,14 +3,14 @@ package com.ydtech.modules.ins.model.yc.ruote;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.ydtech.config.properties.YongchengApiConfigurationProperties;
+import com.ydtech.modules.ins.model.vo.CarInfoVo;
+import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.yc.AuthorityDataXml;
 import com.ydtech.modules.ins.model.yc.YcBuildData;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.ins.model.yc.YcConfigureParameters;
+import com.ydtech.modules.ins.model.yc.modelsQuery.ModelsQueryResponse;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
@@ -155,35 +155,33 @@ public class Ruote {
      * @author: lig
      * @date: 2023年02月08日 0008
      */
-    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, YcConfigureParameters ycConfigureParameters, YongchengApiConfigurationProperties apiComponents, AccidentalDrivingVo adVo) {
+    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, YcConfigureParameters ycConfigureParameters,
+                                        AccidentalDrivingVo adVo, ModelsQueryResponse.VehicleInfo vehicleInfo) {
 
         Ruote m = new Ruote();
         Ruote.RequestLabel requestLabel = new Ruote.RequestLabel();
         Ruote.Condition condition = new Ruote.Condition();
 
-
         //投保人信息
         CustomerInfoVo policyHolderInfo = yaQuoteInfoVo.getPolicyHolderInfo();
         //被保人信息
         CustomerInfoVo insuredPersonInfo = yaQuoteInfoVo.getInsuredPersonInfo();
         //车主
         CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
-
         CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
-
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
 
         /**
          * 基本信息 base
          */
-        Base base = Base.buildBase(carInfo,policyHolderInfo,insuredPersonInfo,riskList, ycConfigureParameters);
+        Base base = Base.buildBase(carInfo, policyHolderInfo, insuredPersonInfo, riskList, ycConfigureParameters);
         condition.setBase(base);
 
         /**
          * 车辆信息
          * 代码：vhl
          */
-        Vhl vhl = Vhl.buildVhl(carInfo,ownerInfo);
+        Vhl vhl = Vhl.buildVhl(carInfo, ownerInfo, vehicleInfo);
 
         String startTime = StringUtils.isNotEmpty(base.getTInsrncBgnTmJQ()) ? base.getTInsrncBgnTmJQ() : base.getTInsrncBgnTmSY();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -278,7 +276,7 @@ public class Ruote {
          * 投保人信息
          * 代码：applicant
          */
-        Applicant applicant = Applicant.buildApplicant(ownerInfo, policyHolderInfo,ycConfigureParameters);
+        Applicant applicant = Applicant.buildApplicant(ownerInfo, policyHolderInfo, ycConfigureParameters);
         condition.setApplicant(applicant);
 
         /**
@@ -300,11 +298,11 @@ public class Ruote {
 
             base.setAppYWFlag("Y");
 
-            if(base.getAppSYFlag().equals("Y")){
+            if (base.getAppSYFlag().equals("Y")) {
                 base.setTInsrncBgnTmYW(base.getTInsrncBgnTmSY());
                 base.setTInsrncEndTmYW(base.getTInsrncEndTmSY());
 
-            }else{
+            } else {
                 base.setTInsrncBgnTmYW(base.getTInsrncBgnTmJQ());
                 base.setTInsrncEndTmYW(base.getTInsrncEndTmJQ());
             }

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

@@ -1,9 +1,9 @@
 package com.ydtech.modules.ins.model.yc.ruote;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
+import com.ydtech.modules.ins.model.yc.modelsQuery.ModelsQueryResponse;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
 import org.apache.http.client.utils.DateUtils;
@@ -139,7 +139,7 @@ public class Vhl {
 //    private String TTransferTm;
     /**
      * 是否外地车
-     *
+     * <p>
      * 本地0，省内异地1，省外异地2
      */
     @JacksonXmlProperty(localName = "CEcdemicMrk")
@@ -331,36 +331,23 @@ public class Vhl {
     /**
      * @description: 车辆信息
      */
-    public static Vhl buildVhl(CarInfoVo carInfo,CustomerInfoVo ownerInfo) {
-
+    public static Vhl buildVhl(CarInfoVo carInfo, CustomerInfoVo ownerInfo, ModelsQueryResponse.VehicleInfo vehicleInfo) {
         Vhl vhl = new Vhl();
-//        //3 车辆信息
-//        CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
-//
-//        //2.2车主
-//        CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
-
+        vhl.setCPlateModelCde(vehicleInfo.getVehicleId());
+        vhl.setCModelCde(vehicleInfo.getVehicleId());
 
-        vhl.setCPlateModelCde(carInfo.getCiModelCode());
-        vhl.setCModelCde(carInfo.getModelCode());
         vhl.setCRegOwner(ownerInfo.getName());
         vhl.setCPlateNo(carInfo.getLicenseNo());
-//      <CModelNme>威志CA7150BUE5S轿车</CModelNme>
-        vhl.setCModelNme(carInfo.getModelcname());
-//        vhl.setNResvNum1(carInfo.getSeatCount());
-
-
+        vhl.setCModelNme(vehicleInfo.getVehicleName());
         LocalDate lDate = LocalDate.parse(carInfo.getRegisterDate());
         LocalDate newlDate = LocalDate.now();
         int years = newlDate.getYear() - lDate.getYear();
         vhl.setCUseYear(years + "");
-
         //玻璃类型 303011001	国产   303011002	进口
         vhl.setCGlassTyp("303011001");
         vhl.setCEcdemicMrk("1");
-
         //过户
-        if (carInfo.isTransferFlag() == true) {
+        if (carInfo.isTransferFlag()) {
             //必传。过户车传1；非过户车传0
             vhl.setCChgOwnerFlag("1");
             vhl.setTTransferDate(carInfo.getTransferDate());
@@ -379,19 +366,19 @@ public class Vhl {
         String enginedesc = carInfo.getEnginedesc();
         vhl.setNDisplacement(enginedesc);
         vhl.setNDefDisplacement(enginedesc);
-        String fullType="32773001";//默认燃油
-        if("0".equals(carInfo.getEnergyType())){
-            fullType="32773001";  //燃油
-        }else if("1".equals(carInfo.getEnergyType())){
-            fullType="32773002";  //纯电动
-        }else if("2".equals(carInfo.getEnergyType())){
-            fullType="32773003";  //燃料电池
-        }else if("3".equals(carInfo.getEnergyType())){
-            fullType="32773004";  //插电式混合动力
-        }else if("4".equals(carInfo.getEnergyType())){
-            fullType="32773005";  //其他混合动力
-        }else if("5".equals(carInfo.getEnergyType())){
-            fullType="32773006";  //其他
+        String fullType = "32773001";//默认燃油
+        if ("0".equals(carInfo.getEnergyType())) {
+            fullType = "32773001";  //燃油
+        } else if ("1".equals(carInfo.getEnergyType())) {
+            fullType = "32773002";  //纯电动
+        } else if ("2".equals(carInfo.getEnergyType())) {
+            fullType = "32773003";  //燃料电池
+        } else if ("3".equals(carInfo.getEnergyType())) {
+            fullType = "32773004";  //插电式混合动力
+        } else if ("4".equals(carInfo.getEnergyType())) {
+            fullType = "32773005";  //其他混合动力
+        } else if ("5".equals(carInfo.getEnergyType())) {
+            fullType = "32773006";  //其他
         }
         vhl.setFuelType(fullType);
 //        vhl.setNActualValue(String.valueOf((Double.parseDouble(carInfo.getPurchasePrice()) * 0.9)));
@@ -401,17 +388,11 @@ public class Vhl {
 //        vhl.setCDisplacementLvl("67");
         vhl.setCFstRegYm(carInfo.getRegisterDate());
         vhl.setNNewPriceValue(carInfo.getPurchasePrice());
-
-
 //
-
         vhl.setCEngNo(carInfo.getEngineNo());
         vhl.setCFrmNo(carInfo.getVinNo());
-
         vhl.setCPlateTyp(carInfo.getLicenseTypeCode());
-
         vhl.setCUsageCde("336001");
-
         //所属性质（1个人 2企业 3机关）
         if (carInfo.getProperty().equals("1")) {
             vhl.setCBizMrk("338001");
@@ -421,20 +402,15 @@ public class Vhl {
             vhl.setCBizMrk("338002");
         }
 
-
         //座位数	NResvNum1	数值(10,0)	N	默认核定载客数-1
         vhl.setNResvNum1(StringUtils.toString(StringUtils.toInt(carInfo.getSeatCount()) - 1));
         //核定载客数   取的座位数
         vhl.setNSeatNum(carInfo.getSeatCount());
-
         vhl.setCVhlTyp(StringUtils.toInt(vhl.getNSeatNum()) < 6 ? "337001" : "337002");
 //        //新旧车标志  0 新车,1 旧车
         vhl.setCNewMrk("1");
-
         //轿车
-        vhl.setCRegVhlTyp("K33");
-
-
+        vhl.setCRegVhlTyp(carInfo.getCartype());
         return vhl;
     }
 

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

src/main/resources/mapper/modules/esm/EsmInsVehicleInspectionCodeMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.esm.dao.EsmInsVehicleInspectionCodeMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.esm.model.EsmInsVehicleInspectionCode">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="vehicleInspectionCode" column="vehicle_inspection_code" jdbcType="VARCHAR"/>
+            <result property="validTime" column="valid_time" jdbcType="DATE"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,company_id,name,
+        vehicle_inspection_code,valid_time
+    </sql>
+
+</mapper>