Merge branch 'master' into tz

gateway/src/main/java/com/jzg/config/CorsConfig.java

@@ -15,6 +15,7 @@ public class CorsConfig {
         // 允许所有来源，你可以根据需要修改为具体的来源
         corsConfiguration.addAllowedOrigin("http://localhost:8080");
         corsConfiguration.addAllowedOrigin("http://localhost:9000");
+        corsConfiguration.addAllowedOrigin("http://localhost:9001");
         corsConfiguration.addAllowedOrigin("http://127.0.0.1:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.149:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.69:9000");
@@ -25,6 +26,8 @@ public class CorsConfig {
         corsConfiguration.addAllowedOrigin("http://192.168.0.22:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.22:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.106:8001");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.106:9001");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.106:9000");
         // 允许的方法
         corsConfiguration.addAllowedMethod("*");
         // 允许的头信息

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/build/BoHaiApiQuoteResultsVoBuild.java

@@ -117,7 +117,7 @@ public class BoHaiApiQuoteResultsVoBuild {
     public static QuoteResultsVo buildQuoteFailResultsVo(QuotationResponse boHaiQuoteResponse) {
         QuoteResultsVo quoteResultsVo = new QuoteResultsVo();
         // 交易流水号
-        quoteResultsVo.setCompanyOrderNo(boHaiQuoteResponse.getData().getBusUniqueId());
+        quoteResultsVo.setCompanyOrderNo(boHaiQuoteResponse.getBaseParam().getRequestNo());
         // 报价失败提示
         quoteResultsVo.setErrorMessage(boHaiQuoteResponse.getResponseMsg());
         quoteResultsVo.setQuoteStatus(InsOrderStatusEnum.QUOTE_FAIL);

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/controller/UnifyOrderManager.java

@@ -189,11 +189,14 @@ public class UnifyOrderManager {
                 platformClient,
                 baseController);
 
+
+
+        Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCode());
+        QuoteInfoConverter.converterCarInfoVo(quoteVo.getCarInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.QUOTE_INFO.getCode()));
         if(CollUtil.isNotEmpty(quoteVo.getKindInfoVo())){
-            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()));
+            QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(),
+                    quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()),
+                    quoteVo.getCarInfoVo());
         }
 
         // 生成订单

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/converter/QuoteInfoConverter.java

@@ -28,53 +28,80 @@ public class QuoteInfoConverter {
                 .stream()
                 .collect(Collectors.groupingBy(QuoteRuleMapping::getGroupCode, Collectors.toMap(QuoteRuleMapping::getPlatformCode, QuoteRuleMapping::getRuleCode)));
         // 使用性质
-        carInfoVo.setCarNatureCode(groupCodeMap
-                .get(QuoteRuleGroup.CAR_NATURE.getCode())
-                .get(carInfoVo.getCarNatureCode()));
+        if(groupCodeMap.containsKey(QuoteRuleGroup.VEHICLE_USE.getCode())){
+            carInfoVo.setCarNatureCode(groupCodeMap
+                    .get(QuoteRuleGroup.VEHICLE_USE.getCode())
+                    .get(carInfoVo.getCarNatureCode()));
+        }
         // 车辆用途
-        carInfoVo.setVehicleUseCode(groupCodeMap
-                .get(QuoteRuleGroup.VEHICLE_USE.getCode())
-                .get(carInfoVo.getVehicleUseCode()));
+        if(groupCodeMap.containsKey(QuoteRuleGroup.VEHICLE_USE.getCode())){
+            carInfoVo.setVehicleUseCode(groupCodeMap
+                    .get(QuoteRuleGroup.VEHICLE_USE.getCode())
+                    .get(carInfoVo.getVehicleUseCode()));
+        }
         // 车辆种类
-        carInfoVo.setCarKindCode(groupCodeMap
-                .get(QuoteRuleGroup.CAR_KIND.getCode())
-                .get(carInfoVo.getCarKindCode()));
+        if(groupCodeMap.containsKey(QuoteRuleGroup.CAR_KIND.getCode())){
+            carInfoVo.setCarKindCode(groupCodeMap
+                    .get(QuoteRuleGroup.CAR_KIND.getCode())
+                    .get(carInfoVo.getCarKindCode()));
+        }
         // 能源类型
-        carInfoVo.setEnergyTypeCode(groupCodeMap
-                .get(QuoteRuleGroup.ENERGY_TYPE.getCode())
-                .get(carInfoVo.getEnergyTypeCode()));
+        if(groupCodeMap.containsKey(QuoteRuleGroup.ENERGY_TYPE.getCode())){
+            carInfoVo.setEnergyTypeCode(groupCodeMap
+                    .get(QuoteRuleGroup.ENERGY_TYPE.getCode())
+                    .get(carInfoVo.getEnergyTypeCode()));
+        }
+
         // 车辆类型 有的保险公司不需要映射
-        String carType = groupCodeMap
-                .get(QuoteRuleGroup.CAR_TYPE.getCode())
-                .get(carInfoVo.getCarTypeCode());
-        if (StringUtils.hasText(carType)) {
-            carInfoVo.setCarTypeCode(carType);
+        if(groupCodeMap.containsKey(QuoteRuleGroup.CAR_TYPE.getCode())){
+            String carType = groupCodeMap
+                    .get(QuoteRuleGroup.CAR_TYPE.getCode())
+                    .get(carInfoVo.getCarTypeCode());
+            if (StringUtils.hasText(carType)) {
+                carInfoVo.setCarTypeCode(carType);
+            }
         }
         // 所属性质
-        carInfoVo.setPropertyCode(groupCodeMap
-                .get(QuoteRuleGroup.PROPERTY.getCode())
-                .get(carInfoVo.getPropertyCode()));
+        if(groupCodeMap.containsKey(QuoteRuleGroup.PROPERTY.getCode())){
+            carInfoVo.setPropertyCode(groupCodeMap
+                    .get(QuoteRuleGroup.PROPERTY.getCode())
+                    .get(carInfoVo.getPropertyCode()));
+        }
+
         // 车辆明细
-        carInfoVo.setLicenseColorCode(groupCodeMap
-                .get(QuoteRuleGroup.CAR_KIND_DETAIL.getCode())
-                .get(carInfoVo.getLicenseColorCode()));
+        if(groupCodeMap.containsKey(QuoteRuleGroup.CAR_KIND_DETAIL.getCode())){
+            carInfoVo.setLicenseColorCode(groupCodeMap
+                    .get(QuoteRuleGroup.CAR_KIND_DETAIL.getCode())
+                    .get(carInfoVo.getLicenseColorCode()));
+        }
+
         // 号牌颜色
-        carInfoVo.setLicenseColorCode(groupCodeMap
-                .get(QuoteRuleGroup.LICENSE_COLOR.getCode())
-                .get(carInfoVo.getLicenseColorCode()));
+        if(groupCodeMap.containsKey(QuoteRuleGroup.LICENSE_COLOR.getCode())){
+            carInfoVo.setLicenseColorCode(groupCodeMap
+                    .get(QuoteRuleGroup.LICENSE_COLOR.getCode())
+                    .get(carInfoVo.getLicenseColorCode()));
+        }
+
         // 号牌种类
-        carInfoVo.setLicenseKindCode(groupCodeMap
-                .get(QuoteRuleGroup.LICENSE_KIND.getCode())
-                .get(carInfoVo.getLicenseKindCode()));
+        if(groupCodeMap.containsKey(QuoteRuleGroup.LICENSE_KIND.getCode())){
+            carInfoVo.setLicenseKindCode(groupCodeMap
+                    .get(QuoteRuleGroup.LICENSE_KIND.getCode())
+                    .get(carInfoVo.getLicenseKindCode()));
+        }
+
     }
 
     /**
      * @param kindInfoVo           险种信息
      * @param quoteRuleMappingList 报价规则映射
+     * @param carInfoVo
      */
-    public static void converterKindInfoVo(List<KindInfoVo> kindInfoVo, List<QuoteRuleMapping> quoteRuleMappingList) {
+    public static void converterKindInfoVo(List<KindInfoVo> kindInfoVo, List<QuoteRuleMapping> quoteRuleMappingList, CarInfoVo carInfoVo) {
+
+        String groupCode = carInfoVo.getEnergyTypeCode().equals("0") ?
+                QuoteRuleGroup.BUS_KIND.getCode():QuoteRuleGroup.NEW_ENERGY_KIND.getCode();
         Map<String, QuoteRuleMapping> ruleMappingMap = quoteRuleMappingList
-                .stream()
+                .stream().filter(x -> x.getGroupCode().equals(groupCode))
                 .collect(Collectors.toMap(QuoteRuleMapping::getPlatformCode, x -> x));
         kindInfoVo.forEach(kind -> {
             QuoteRuleMapping quoteRuleMapping = ruleMappingMap.get(kind.getKindCode());

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()) {

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/po/YangGuangApiOrder.java

@@ -24,6 +24,10 @@ public class YangGuangApiOrder {
      * 交互唯一订单 OrderBase类的ordersNo
      */
     private String ordersNo;
+    /**
+     * 阳光保险交易流水号
+     */
+    private String infotransNo;
     /**
      * 产品代码
      */

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangUpLoadRequest.java

@@ -90,7 +90,7 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
             private List<insuranceImageList> insuranceImageList;
 
             public imageInfo(YangGuangApiOrder yangGuangApiOrder,InsuranceImageVo.ImageDTO imageDTO, YangGuangConfigureParameters parameters, InsuranceImageVo insuranceImageVo) {
-                this.caseNo = yangGuangApiOrder.getOrdersNo();
+                this.caseNo = yangGuangApiOrder.getInfotransNo();
                 this.appCode = "CARAPPLY";
                 this.caseSource = "0";
                 this.fileServer = "0";
@@ -146,7 +146,7 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
                     this.referer = "SXJZG";
                     this.userNo = parameters.getHandlerCode();
                     this.userAccountName = parameters.getHandlerCode();
-                    String imageType = insuranceImageVo.getImageType();
+                    String imageType = insuranceImageVo.getImageCode();
                     InsuranceImageEnum insuranceImageEnum = Enum.valueOf(InsuranceImageEnum.class, imageType);
                     for (ImageTypeEnum imageTypeEnum : ImageTypeEnum.values()) {
                         boolean contains = Arrays.asList(imageTypeEnum.getImagesType()).contains(insuranceImageEnum.getCode());

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -89,13 +89,14 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
                 newRequest.setInfotransNo(yangGuangQueryVehicleModelResponse.getInfotransNo());
                 return recursiveQuote(newRequest, carModel, yangGuangQueryVehicleModelResponse,quoteVo, parameters);
             }
-            handleFailedQuote(response);
+            handleFailedQuote(response, quoteVo);
         }
 
         return handleSuccessfulQuote(response, quoteVo);
     }
 
-    private QuoteResultsVo handleFailedQuote(YangGuangAccuracyCalculateResponse response) {
+    private QuoteResultsVo handleFailedQuote(YangGuangAccuracyCalculateResponse response,QuoteVo quoteVo) {
+        yangGuangCrawlerOrderService.saveOrderInfo(quoteVo,response);
         return YangGuangApiQuoteResultsVoBuild.buildQuoteFailResultsVo(response);
     }
 
@@ -220,6 +221,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
 
     @Override
     public DownloadPolicyResultVo downloadPolicy(DownloadPolicyVo downloadPolicyVo) {
+
         return null;
 
     }

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangCrawlerOrderServiceImpl.java

@@ -32,6 +32,7 @@ public class YangGuangCrawlerOrderServiceImpl implements YangGuangCrawlerOrderSe
         List<YangGuangAccuracyCalculateResponse.PtptNonVehicleProductInformationList> list = yangGuangAccuracyCalculateResponse.getPtptNonVehicleProductInformationList();
         JSONArray array = JSONArray.parseArray(JSON.toJSONString(list));
         yangGuangApiOrder.setCrossInsurance(array);
+        yangGuangApiOrder.setInfotransNo(yangGuangAccuracyCalculateResponse.getInfotransNo());
         yangGuangApiOrderRepository.save(yangGuangApiOrder);
     }