Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/Impl/HuaTaiCrawlerRequestImpl.java

@@ -470,9 +470,9 @@ public class HuaTaiCrawlerRequestImpl implements HuaTaiCrawlerRequest {
                     // 累加计数，超过次数则抛出异常
                     if (retryCount.incrementAndGet() >= MAX_RETRY_TIMES) {
                         if(e.getMessage().contains("上传的行业车型编码不在平台车型范围内，请核实。")) {
-                            throw new SystemException("报价重试次数已达上限(" + MAX_RETRY_TIMES + "次)，车型匹配失败。上传的行业车型编码不在平台车型范围内，请核实。", e.getMessage());
+                            throw new SystemException("上传的行业车型编码不在平台车型范围内，请核实。");
                         }else {
-                            throw new SystemException("报价重试次数已达上限(" + MAX_RETRY_TIMES + "次)，车型匹配失败。" + e.getMessage());
+                            throw new SystemException(e.getMessage());
                         }
                     }
                     // 提取新的modelcodexh并重新执行预处理
@@ -480,7 +480,7 @@ public class HuaTaiCrawlerRequestImpl implements HuaTaiCrawlerRequest {
                     continue; // 继续下一次循环
                 }
                 // 非车型匹配异常，直接抛出
-                throw e;
+                throw new SystemException(e.getMessage());
             }
             // 无有效数据且未触发异常时，累加计数
             retryCount.incrementAndGet();

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -588,7 +588,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         //过滤 能源类型 使用性质 车辆种类
         List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>().
                 eq(PtlScheme::getCompanyId, companyId).eq(PtlScheme::getEnergyType, energyType).
-                like(PtlScheme::getCarnature, carnature).like(PtlScheme::getVehicleType, vehicleType).
+                eq(PtlScheme::getCarnature, carnature).eq(PtlScheme::getVehicleType, vehicleType).
                 eq(PtlScheme::getProductId, productId).eq(PtlScheme::getIsDelete, 0));
         Map<String, PtlScheme> collectPtlSchemes = ptlSchemes.stream().collect(Collectors.toMap(PtlScheme::getId, Function.identity()));
         AssertionUtils.isFail(collectPtlSchemes.isEmpty(), "没有可报价的方案配置信息");