保费到期提醒23-保单邮件逐条通知

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiPolicyFollowExportService.java

@@ -10,7 +10,7 @@ import com.yd.csf.service.component.TemplateStyleStrategy;
 import com.yd.csf.service.dto.PolicyFollowQueryRequest;
 import com.yd.csf.service.dto.PolicyFollowQueryRequest;
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.service.PolicyFollowService;
 import com.yd.csf.service.service.PolicyFollowService;
-import com.yd.csf.service.utils.RenewalDueDateCalculator;
+import com.yd.csf.service.component.renewal.RenewalDueDateCalculator;
 import com.yd.csf.service.utils.SimpleDateUtils;
 import com.yd.csf.service.utils.SimpleDateUtils;
 import com.yd.csf.service.vo.RenewalPolicyExportDTO;
 import com.yd.csf.service.vo.RenewalPolicyExportDTO;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/RenewalDispatchServiceImpl.java

@@ -4,9 +4,10 @@ import com.yd.common.exception.BusinessException;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.api.service.RenewalDispatchService;
 import com.yd.csf.api.service.RenewalDispatchService;
 import com.yd.csf.api.service.RenewalMailService;
 import com.yd.csf.api.service.RenewalMailService;
-import com.yd.csf.service.component.RenewalPolicyReportService;
-import com.yd.csf.service.dto.RenewalDuePolicy;
-import com.yd.csf.service.dto.RenewalReminderData;
+import com.yd.csf.service.component.renewal.RenewalPolicyMailBuilder;
+import com.yd.csf.service.component.renewal.RenewalPolicyReportService;
+import com.yd.csf.service.component.renewal.RenewalDuePolicy;
+import com.yd.csf.service.component.renewal.RenewalReminderData;
 import com.yd.csf.service.enums.RenewalMailTypeEnum;
 import com.yd.csf.service.enums.RenewalMailTypeEnum;
 import com.yd.csf.service.enums.RenewalRemindStatusEnum;
 import com.yd.csf.service.enums.RenewalRemindStatusEnum;
 import com.yd.csf.service.model.RenewalRemindBatch;
 import com.yd.csf.service.model.RenewalRemindBatch;

yd-csf-service/src/main/java/com/yd/csf/service/utils/RenewalDueDateCalculator.java → yd-csf-service/src/main/java/com/yd/csf/service/component/renewal/RenewalDueDateCalculator.java

-package com.yd.csf.service.utils;
+package com.yd.csf.service.component.renewal;
 
 
 import com.yd.csf.feign.enums.PaymentFrequencyEnum;
 import com.yd.csf.feign.enums.PaymentFrequencyEnum;
 import lombok.Getter;
 import lombok.Getter;

yd-csf-service/src/main/java/com/yd/csf/service/dto/RenewalDuePolicy.java → yd-csf-service/src/main/java/com/yd/csf/service/component/renewal/RenewalDuePolicy.java

-package com.yd.csf.service.dto;
+package com.yd.csf.service.component.renewal;
 
 
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.model.PolicyFollow;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

yd-csf-service/src/main/java/com/yd/csf/service/component/RenewalPolicyReportService.java → yd-csf-service/src/main/java/com/yd/csf/service/component/renewal/RenewalPolicyReportService.java

-package com.yd.csf.service.component;
+package com.yd.csf.service.component.renewal;
 
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcel;
-import com.yd.csf.service.dto.RenewalDuePolicy;
-import com.yd.csf.service.dto.RenewalReminderData;
+import com.yd.csf.service.component.TemplateStyleStrategy;
 import com.yd.csf.service.vo.RenewalPolicyExportDTO;
 import com.yd.csf.service.vo.RenewalPolicyExportDTO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;

yd-csf-service/src/main/java/com/yd/csf/service/utils/RenewalPremiumUtils.java → yd-csf-service/src/main/java/com/yd/csf/service/component/renewal/RenewalPremiumUtils.java

-package com.yd.csf.service.utils;
+package com.yd.csf.service.component.renewal;
 
 
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.model.PolicyFollow;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;

yd-csf-service/src/main/java/com/yd/csf/service/dto/RenewalReminderData.java → yd-csf-service/src/main/java/com/yd/csf/service/component/renewal/RenewalReminderData.java

-package com.yd.csf.service.dto;
+package com.yd.csf.service.component.renewal;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;

yd-csf-service/src/main/java/com/yd/csf/service/service/RenewalReminderQueryService.java

 package com.yd.csf.service.service;
 package com.yd.csf.service.service;
 
 
-import com.yd.csf.service.dto.RenewalReminderData;
+import com.yd.csf.service.component.renewal.RenewalReminderData;
 
 
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.YearMonth;

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/RenewalReminderQueryServiceImpl.java

@@ -2,12 +2,12 @@ package com.yd.csf.service.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yd.csf.service.dao.PolicyFollowMapper;
 import com.yd.csf.service.dao.PolicyFollowMapper;
-import com.yd.csf.service.dto.RenewalDuePolicy;
-import com.yd.csf.service.dto.RenewalReminderData;
+import com.yd.csf.service.component.renewal.RenewalDuePolicy;
+import com.yd.csf.service.component.renewal.RenewalReminderData;
 import com.yd.csf.service.enums.PolicyFollowStatusEnum;
 import com.yd.csf.service.enums.PolicyFollowStatusEnum;
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.service.RenewalReminderQueryService;
 import com.yd.csf.service.service.RenewalReminderQueryService;
-import com.yd.csf.service.utils.RenewalDueDateCalculator;
+import com.yd.csf.service.component.renewal.RenewalDueDateCalculator;
 import com.yd.csf.service.utils.SimpleDateUtils;
 import com.yd.csf.service.utils.SimpleDateUtils;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;

yd-csf-service/src/main/java/com/yd/csf/service/vo/RenewalPolicyExportDTO.java

@@ -2,6 +2,7 @@ package com.yd.csf.service.vo;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.yd.csf.service.component.renewal.RenewalPremiumUtils;
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.model.PolicyFollow;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -152,10 +153,10 @@ public class RenewalPolicyExportDTO {
 
 
     /**
     /**
      * 总保费及征费 = 期交保费 + 保单征费；两者均无值时留空，征费为空或非数字按 0 处理。
      * 总保费及征费 = 期交保费 + 保单征费；两者均无值时留空，征费为空或非数字按 0 处理。
-     * 口径与逐单邮件共用 {@link com.yd.csf.service.utils.RenewalPremiumUtils}。
+     * 口径与逐单邮件共用 {@link RenewalPremiumUtils}。
      */
      */
     private static String buildTotalPremiumAndLevy(PolicyFollow p) {
     private static String buildTotalPremiumAndLevy(PolicyFollow p) {
-        BigDecimal total = com.yd.csf.service.utils.RenewalPremiumUtils.totalPremiumAndLevy(p);
+        BigDecimal total = RenewalPremiumUtils.totalPremiumAndLevy(p);
         return total == null ? null : total.toPlainString();
         return total == null ? null : total.toPlainString();
     }
     }
 }
 }