Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/vo/RuleAttrMappingVo.java

@@ -81,9 +81,9 @@ public class RuleAttrMappingVo {
         long between = ChronoUnit.YEARS.between(registrationDate, currentDate) + 1;
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("VehicleAge", String.valueOf(between)));
         //转续保 交强
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqRenewalOfInsurance", insOrdersOther.getJqRenewal() != null && insOrdersOther.getJqRenewal() == 2 ? "是" : "否"));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqRenewalOfInsurance", insOrdersOther.getJqRenewal() != null && insOrdersOther.getJqRenewal() == 2 ? "1" : "0"));
         //转续保 商业
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyRenewalOfInsurance", insOrdersOther.getSyRenewal() != null && insOrdersOther.getSyRenewal() == 2 ? "是" : "否"));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyRenewalOfInsurance", insOrdersOther.getSyRenewal() != null && insOrdersOther.getSyRenewal() == 2 ? "1" : "0"));
         // 车主
         InsOrdersCarUserInfo ownerInfo = insOrdersCarUserInfos.stream()
                 .filter(insOrdersCarUserInfo -> insOrdersCarUserInfo.getPolicyPersonType().equals(1)).findFirst().orElse(null);

tenant/costsorrule/src/main/java/com/jzg/costsorrule/controller/RuleController.java

@@ -106,9 +106,6 @@ public class RuleController extends BaseController {
         StringBuilder logs = new StringBuilder();
         for (Map.Entry<String, List<RuleAttrLinkVo>> entry : converMaps.entrySet()) {
             String key = entry.getKey();
-            if (key.contains("9617")) {
-                System.out.println(11);
-            }
             List<RuleAttrLinkVo> vos = entry.getValue();
             if(ruleService.verificationRule(attrMap,vos,rulesAttrs,logs)){
                 String[] keys = key.split("-");

tenant/costsorrule/src/main/java/com/jzg/costsorrule/service/impl/RuleServiceImpl.java

@@ -115,10 +115,6 @@ public class RuleServiceImpl implements RuleService {
         } else if (rulesAttr.getAttrType().equals(AttrTypeConstant.INPUTTAG.getCode())) {
             return inputTagEqual(linkVo, value);
         } else if (rulesAttr.getAttrType().equals(AttrTypeConstant.SELECT.getCode())) {
-            //截取车牌
-            if (linkVo.getAttrCode().equals("LicenseNo")) {
-                value = value.substring(0, 4);
-            }
             return selectEqual(linkVo, value);
         } else if (rulesAttr.getAttrType().equals(AttrTypeConstant.RADIO.getCode())) {
             return radioEqual(linkVo, value);

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

@@ -295,7 +295,7 @@ public class UnifyOrderManager {
                 .getApiType(), sysQuoteConfigService, sysQuoteRedisService, platformClient, baseController);
 
         // 生成主订单及子订单  返回子订单id
-        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName,systemCode, quoteVo.getProductId());
+        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName,systemCode, quoteVo.getOrder().getProductId());
 
         // 添加车辆没有的参数: 车辆明细、
         QuoteInfoParameterFilling.setParameterSettings(quoteVo, esmInsCompanyHttpResult.getData().getCompanyCode());

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/entity/request/AuditRequest.java

@@ -399,10 +399,10 @@ public class AuditRequest {
         condition.setNgo("");
         condition.setTResvTm("");
         condition.setCScsyxz("");
-        condition.setCPintubeName("测试");
-        condition.setCPintubeLicenceNo("110");
-        condition.setCPintubeTel("110");
-        condition.setMaintenanceStaffCode("110");
+        condition.setCPintubeName("");
+        condition.setCPintubeLicenceNo("");
+        condition.setCPintubeTel("");
+        condition.setMaintenanceStaffCode("");
         condition.setYwFlag("1");
         //<condition>
 

tenant/insurance/quotation-zhongan/src/main/java/com/jzg/quotation/zhongan/crawler/entity/dto/NonAutoInfoDto.java

@@ -21,7 +21,6 @@ public class NonAutoInfoDto {
     private String insuredFlag;
 
     @JsonProperty("combination")
-    // 0-快速 2-旗舰 3-尊享 4-豪华 5-至尊 6-标准
     private String combination;
 
 }

tenant/insurance/quotation-zhongan/src/main/java/com/jzg/quotation/zhongan/crawler/entity/request/ZhongAnCrawlerQuoteRequest.java

@@ -104,6 +104,8 @@ public class ZhongAnCrawlerQuoteRequest{
                 coverageInfoDTO.setProductId(kindInfo.getKindCode());
                 if (kindInfo.getKindCode().equals("1510030943") || kindInfo.getKindCode().equals("1510052324")) {
                     coverageInfoDTO.setAmount(quoteBaseResponse.getValue().getBaseInfo().getVehicleActualPrice());
+                } else if (kindInfo.getKindCode().equals("1510052328")) {
+                    coverageInfoDTO.setAmount(quoteBaseResponse.getValue().getBaseInfo().getVehicleActualPrice());
                 } else {
                     coverageInfoDTO.setAmount(kindInfo.getAmount());
                 }