Explorar o código

调整费用未匹配日志颜色显示

785834757 %!s(int64=2) %!d(string=hai) anos
pai
achega
f4f811b5f6

+ 11 - 5
src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -1613,8 +1613,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 
             //如果查找不到 传值属性 直接费用对比失败
             if (ruleAttrMappingVo == null) {
-                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLink.getAttrCode());
                 log.debug("传入的值找不到该属性:" + ptlAgreementProductCostsAttrLink.getAttrCode());
+                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLink.getAttrCode());
+
 
                 List<PtlAgreementUndwrtRulesAttr> collect = rulesAttrs.stream()
                         .filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLink.getAttrCode()))
@@ -1633,17 +1634,15 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 
             useFlag = attrEqual(ptlAgreementProductCostsAttrLink, ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
             if (!useFlag) {
-                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLink.getAttrCode());
                 log.debug("检验的值:" + ptlAgreementProductCostsAttrLink.getMin());
                 log.debug("传入的值:" + ruleAttrMappingVo.getValue());
+                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLink.getAttrCode());
+
 
                 List<PtlAgreementUndwrtRulesAttr> collect = rulesAttrs.stream()
                         .filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLink.getAttrCode()))
                         .collect(Collectors.toList());
 
-                if (!collect.isEmpty()) {
-                    logs.append("规则匹配失败:" + collect.get(0).getAttrName() + "\n");
-                }
 
                 if (ptlAgreementProductCostsAttrLink.getMin() != null) {
                     logs.append("检验的值:" + ptlAgreementProductCostsAttrLink.getMin() + "\n");
@@ -1652,6 +1651,13 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 }
 
                 logs.append("传入的值:" + ruleAttrMappingVo.getValue() + "\n");
+
+                if (!collect.isEmpty()) {
+                    logs.append("<span style=\"color:red;\">规则匹配失败:" + collect.get(0).getAttrName() + "</span>\n");
+                }
+
+
+
                 return false;
             }