Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -19,6 +19,7 @@ import com.jzg.commons.util.MinioUtils;
 import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.commons.constant.enums.base.QuoteRuleCategory;
+import com.jzg.quotation.commons.constant.enums.base.QuoteRuleGroup;
 import com.jzg.quotation.commons.entity.vo.aggregated.*;
 import com.jzg.quotation.commons.entity.vo.orders.InsOrdersVo;
 import com.jzg.quotation.commons.service.QuotationApiBaseService;
@@ -189,7 +190,9 @@ public class UnifyOrderManager {
                 baseController);
 
         if(CollUtil.isNotEmpty(quoteVo.getKindInfoVo())){
-            Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCode());
+            String groupCode = quoteVo.getCarInfoVo().getEnergyTypeCode().equals("0") ?
+                    QuoteRuleGroup.BUS_KIND.getCode():QuoteRuleGroup.NEW_ENERGY_KIND.getCode();
+            Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCode(), groupCode);
             QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()));
         }
 

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);
+    Map<String, List<QuoteRuleMapping>> getByInsuranceCompanyCode(String insuranceCompanyCode, String groupCode);
 
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersKind;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.summary.mapper.InsOrdersKindMapper;
 import com.jzg.quotation.summary.service.InsOrdersKindService;
 import org.springframework.stereotype.Service;
@@ -23,9 +24,11 @@ public class InsOrdersKindServiceImpl extends ServiceImpl<InsOrdersKindMapper, I
             for (KindInfoVo kindInfoVo1 : kindInfoVo) {
                 InsOrdersKind insOrdersKind = new InsOrdersKind();
                 insOrdersKind.setOrderNo(insOrders.getId());
-                insOrdersKind.setAmount(new BigDecimal(kindInfoVo1.getAmount()));
                 insOrdersKind.setKindCode(kindInfoVo1.getKindCode());
                 insOrdersKind.setKindName(kindInfoVo1.getKindName());
+                if(StringUtils.isNotEmpty(kindInfoVo1.getAmount())){
+                    insOrdersKind.setAmount(new BigDecimal(kindInfoVo1.getAmount()));
+                }
                 if(Objects.nonNull(kindInfoVo1.getServiceTimes())) {
                     insOrdersKind.setServiceTimes(Integer.parseInt(kindInfoVo1.getServiceTimes()));
                 }

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

@@ -67,7 +67,7 @@ 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);
+        Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(insuranceCode,null);
         QuoteInfoConverter.converterCarInfoVo(quoteVo.getCarInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.QUOTE_INFO.getCode()));
         QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()));
         return getQuotationBase(order.getApiType(), insuranceCode).quote(quoteVo);

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

@@ -2,11 +2,11 @@ package com.jzg.quotation.summary.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
 import com.jzg.quotation.summary.mapper.QuoteRuleMappingMapper;
 import com.jzg.quotation.summary.service.QuoteRuleMappingService;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -22,9 +22,10 @@ public class QuoteRuleMappingServiceImpl extends ServiceImpl<QuoteRuleMappingMap
         implements QuoteRuleMappingService {
 
     @Override
-    public Map<String, List<QuoteRuleMapping>> getByInsuranceCompanyCode(String insuranceCompanyCode) {
+    public Map<String, List<QuoteRuleMapping>> getByInsuranceCompanyCode(String insuranceCompanyCode,String groupCode) {
         List<QuoteRuleMapping> list = lambdaQuery()
                 .eq(QuoteRuleMapping::getInsuranceCompanyCode, insuranceCompanyCode)
+                .eq(StringUtils.isNotEmpty(groupCode),QuoteRuleMapping::getGroupCode,groupCode)
                 .list();
 
         if (list.isEmpty()) {
@@ -33,7 +34,7 @@ public class QuoteRuleMappingServiceImpl extends ServiceImpl<QuoteRuleMappingMap
 
         return list
                 .stream()
-                .filter(quoteKindMapping -> StringUtils.hasLength(quoteKindMapping.getPlatformCode()))
+                .filter(quoteKindMapping -> org.springframework.util.StringUtils.hasLength(quoteKindMapping.getPlatformCode()))
                 .collect(Collectors.groupingBy(QuoteRuleMapping::getCategory));
     }