Просмотр исходного кода

处理的核保规则匹配、费用匹配问题

lixiaolong 2 недель назад
Родитель
Сommit
26a384d83c

+ 3 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/AuditVerificationAspect.java

@@ -16,6 +16,7 @@ import com.jzg.commons.entity.vo.AgreementVo;
 import com.jzg.commons.entity.vo.RuleAttrMappingVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.summary.aop.FactorMatch;
 import com.jzg.quotation.summary.client.PtlNewAgreementClient;
@@ -246,11 +247,12 @@ public class AuditVerificationAspect {
             }
 
             // 直接判断该规则组是否匹配,无需循环调用
+            // 有一个匹配上  或者都没匹配上 都返回true
             boolean ruleMatched = FactorMatch.judgementsUnderwrite(ptlAgreementUndwrtRulesNews, ruleAttrMappingVoList, undwrtRulesAttrList, ruleLogs, undwrtRulesDictList);
 
             log.info("规则组[{}]匹配结果: ruleMatched={}, 错误日志=[{}]", groupIndex, ruleMatched, ruleLogs.toString());
 
-            if (ruleMatched) {
+            if (ruleMatched && StringUtils.isNotBlank(ruleLogs)) {//ruleLogs 不为空 表示有一个匹配上
                 anyRuleMatched = true;
                 log.info("规则组[{}]匹配成功, 订单通过!", groupIndex);
                 log.info("=== 承保规则校验成功,规则组[{}]通过 ===", groupIndex);