Переглянути джерело

feat:兼容通过估值表文件的方式报送基金净值

mozuwen 5 місяців тому
батько
коміт
0c6ecb32b6

+ 3 - 0
service-base/src/main/java/com/simuwang/base/common/util/EmailUtil.java

@@ -235,6 +235,9 @@ public class EmailUtil {
         if (subject.contains("净值") || subject.contains("规模") || subject.contains("业绩报酬") || subject.contains("业绩提成")) {
             return EmailTypeConst.NAV_EMAIL_TYPE;
         }
+        if (subject.contains("估值表")) {
+            return EmailTypeConst.VALUATION_EMAIL_TYPE;
+        }
         return null;
 //        if (MapUtil.isEmpty(emailTypeMap) || StrUtil.isBlank(subject)) {
 //            return EmailTypeConst.NAV_EMAIL_TYPE;

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

@@ -87,14 +87,14 @@ public class NavEmailParser extends AbstractEmailParser {
             Optional.ofNullable(fundNavDTOList).ifPresent(emailFundNavDTOList::addAll);
         }
 
-//        // 兼容净值邮件,但附件是估值表的情况
-//        if (CollUtil.isEmpty(emailFundNavDTOList)) {
-//            // 判断文件名是否包含"估值表"
-//            String fileName = emailContentInfoDTO.getFileName();
-//            if (StrUtil.isNotBlank(fileName) && fileName.contains("估值表")) {
-//                emailFundNavDTOList = valuationEmailParser.parse(emailContentInfoDTO, emailFieldMap);
-//            }
-//        }
+        // 兼容净值邮件,但附件是估值表的情况
+        if (CollUtil.isEmpty(emailFundNavDTOList)) {
+            // 判断文件名是否包含"估值表"
+            String fileName = emailContentInfoDTO.getFileName();
+            if (StrUtil.isNotBlank(fileName) && fileName.contains("估值表")) {
+                emailFundNavDTOList = valuationEmailParser.parse(emailContentInfoDTO, emailFieldMap);
+            }
+        }
         // email_fund_nav增加template_id字段
         if (CollUtil.isNotEmpty(emailFundNavDTOList)) {
             emailFundNavDTOList.forEach(e -> e.setTemplateId(0));