费用因子添加 车主地址 投保人地址 被保人地址

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -123,6 +123,8 @@ public class RuleAttrMappingVo {
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarOwnersAge", ownerInfo.getAge()));
             //车主 性别
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarOwnersSex", ownerInfo.getGender().equals("男") ? "1" : "2"));
+            //车主地址
+            ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarOwnersAddress", ownerInfo.getAddr()));
         }
         //车主 姓名
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarOwnerName", ownerInfo.getName()));
@@ -135,6 +137,8 @@ public class RuleAttrMappingVo {
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("ApplicantAge", policyHolderInfo.getAge()));
             //投保人 性别
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("ApplicantSex", policyHolderInfo.getGender().equals("男") ? "1" : "2"));
+            //投保人地址
+            ruleAttrMappingVoList.add(new RuleAttrMappingVo("ApplicantAddress", policyHolderInfo.getAddr()));
         }
 
         CustomerInfoVo insuredPersonInfo = insOrders.getInsureinfo().toJavaObject(CustomerInfoVo.class);
@@ -145,6 +149,8 @@ public class RuleAttrMappingVo {
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredAge", insuredPersonInfo.getAge()));
             //被保人 性别
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredSex", insuredPersonInfo.getGender().equals("男") ? "1" : "2"));
+            //被保人地址
+            ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredAddress", insuredPersonInfo.getAddr()));
         }
         String OPIConsistent = "0";
         if(StringUtils.isNotBlank(ownerInfo.getProperty())){

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -3221,7 +3221,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         if(equalsMap.contains(ptlAgreementProductCostsAttrLink.getAttrCode())){
             boolean b = Arrays.stream(split).anyMatch(value::equals);
             returnBool.set(b);
-        }else if((ptlAgreementProductCostsAttrLink.getAttrCode().equals("BrandandModel") || ptlAgreementProductCostsAttrLink.getAttrCode().equals("CarOwnerName"))
+        }else if((ptlAgreementProductCostsAttrLink.getAttrCode().equals("BrandandModel") || ptlAgreementProductCostsAttrLink.getAttrCode().equals("CarOwnerName")
+                || ptlAgreementProductCostsAttrLink.getAttrCode().equals("CarOwnersAddress") || ptlAgreementProductCostsAttrLink.getAttrCode().equals("ApplicantAddress")
+                || ptlAgreementProductCostsAttrLink.getAttrCode().equals("InsuredAddress"))
                 && ptlAgreementProductCostsAttrLink.getOperator().equals("2")){
             //处理品牌型号  不包含的情况
             boolean anyMatch = Arrays.stream(split)