Bläddra i källkod

fix: 通用模板解析不到数据时,走配置模板

chenjianhua 4 månader sedan
förälder
incheckning
01ba0b5c3a
1 ändrade filer med 10 tillägg och 2 borttagningar
  1. 10 2
      service-daq/src/main/java/com/simuwang/daq/service/NavEmailParser.java

+ 10 - 2
service-daq/src/main/java/com/simuwang/daq/service/NavEmailParser.java

@@ -101,8 +101,16 @@ public class NavEmailParser extends AbstractEmailParser {
         }
 
         // 通用模版解析 -> 根据配置的模板进行解析
-        if (CollUtil.isEmpty(emailFundNavDTOList) || forceTemplateEnable) {
-            emailFundNavDTOList = emailTemplateService.parseUsingTemplate(emailContentInfoDTO);
+        long successNavCount = 0;
+        if (CollUtil.isNotEmpty(emailFundNavDTOList)) {
+            successNavCount = emailFundNavDTOList.stream().filter(e -> e != null && StrUtil.isBlank(e.getFailReason())).count();
+        }
+        //如果通用模板解析不到正确数据,就走模板解析一次
+        if (successNavCount == 0 || forceTemplateEnable) {
+            List<EmailFundNavDTO> templateFundNavDTOList = emailTemplateService.parseUsingTemplate(emailContentInfoDTO);
+            if(CollUtil.isNotEmpty(templateFundNavDTOList)){
+                emailFundNavDTOList.addAll(templateFundNavDTOList);
+            }
         }
         return emailFundNavDTOList;
     }