诚泰完善修复

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/InsurePremiumRequest.java

@@ -491,13 +491,13 @@ public class InsurePremiumRequest extends BaseRequest {
                     CoverageDTO coverageDTO = new CoverageDTO();
                     coverageDTO.kindCode = code;
                     // 司机
-                    if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getDriver(), code) >= 0) {
+                    if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getCtDriver(), code) >= 0) {
                         coverageDTO.quantity = 1;
                         coverageDTO.unitAmount = Double.parseDouble(kindInfoVo.getAmount());
                         coverageDTO.amount = new BigDecimal(kindInfoVo.getAmount());
                     }
                     // 乘客
-                    else if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getPassenger(), code) >= 0) {
+                    else if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getCtPassenger(), code) >= 0) {
                         coverageDTO.quantity = Integer.parseInt(quoteVo.getCarInfoVo().getSeatCount()) -1;
                         coverageDTO.unitAmount = Double.parseDouble(kindInfoVo.getUnitAmount());
                         coverageDTO.amount = new BigDecimal(kindInfoVo.getUnitAmount()).multiply(BigDecimal.valueOf(coverageDTO.quantity));

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/InsuranceTypeCorrespondence.java

@@ -66,6 +66,13 @@ public class InsuranceTypeCorrespondence {
     //中煤使用性质转换关系
     protected static final Map<String, String> ZM_CAR_MotorUsageTypeCode = new HashMap<>();
 
+    // 诚泰乘客
+    protected static final String[] CT_PASSENGER = {"D12", "YD12"};
+
+    // 诚泰司机
+    protected static final String[] CT_DRIVER = {"D11", "YD11"};
+
+
     static {
         ZhongMei_RISK_1379.put("0507", "0330");
         ZhongMei_RISK_1379.put("0510", "0361");
@@ -154,6 +161,14 @@ public class InsuranceTypeCorrespondence {
         return DRIVER;
     }
 
+    public static String[] getCtPassenger() {
+        return CT_PASSENGER;
+    }
+
+    public static String[] getCtDriver() {
+        return CT_DRIVER;
+    }
+
     public static String[] getAbsoluteDeductible() {
         return ABSOLUTE_DEDUCTIBLE;
     }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/QuoteRuleMappingService.java

@@ -19,6 +19,6 @@ public interface QuoteRuleMappingService extends IService<QuoteRuleMapping> {
      * @param insuranceCompanyCode 保险公司code
      * @return 映射关系
      */
-    Map<String, List<QuoteRuleMapping>> getByInsuranceCompanyCode(String insuranceCompanyCode, String groupCode);
+    Map<String, List<QuoteRuleMapping>> getByInsuranceCompanyCode(String insuranceCompanyCode);
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsuranceCompanyRequestServiceImpl.java

@@ -1,6 +1,5 @@
 package com.jzg.quotation.summary.service.impl;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.constant.enums.base.ApiType;
 import com.jzg.quotation.commons.constant.enums.base.QuoteRuleCategory;
@@ -67,9 +66,9 @@ public class InsuranceCompanyRequestServiceImpl implements InsuranceCompanyReque
     public QuoteResultsVo quote(QuoteVo quoteVo) throws Exception {
         OrderBase order = quoteVo.getOrder();
         String insuranceCode = extractEnglishChars(order.getInsuranceCompanyCode());
-        Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(insuranceCode,null);
+        Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(insuranceCode);
         QuoteInfoConverter.converterCarInfoVo(quoteVo.getCarInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.QUOTE_INFO.getCode()));
-        QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()));
+        QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()), quoteVo.getCarInfoVo());
         return getQuotationBase(order.getApiType(), insuranceCode).quote(quoteVo);
     }
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/QuoteRuleMappingServiceImpl.java

@@ -22,10 +22,9 @@ public class QuoteRuleMappingServiceImpl extends ServiceImpl<QuoteRuleMappingMap
         implements QuoteRuleMappingService {
 
     @Override
-    public Map<String, List<QuoteRuleMapping>> getByInsuranceCompanyCode(String insuranceCompanyCode,String groupCode) {
+    public Map<String, List<QuoteRuleMapping>> getByInsuranceCompanyCode(String insuranceCompanyCode) {
         List<QuoteRuleMapping> list = lambdaQuery()
                 .eq(QuoteRuleMapping::getInsuranceCompanyCode, insuranceCompanyCode)
-                .eq(StringUtils.isNotEmpty(groupCode),QuoteRuleMapping::getGroupCode,groupCode)
                 .list();
 
         if (list.isEmpty()) {