出账检核-增加币种41

yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneQueryRequest.java

@@ -60,18 +60,16 @@ public class FortuneQueryRequest extends PageDto implements Serializable {
     private List<String> productLaunchBizIdList;
     private List<String> productLaunchBizIdList;
 
 
     /**
     /**
-     * 出账日（估）开始
+     * 出账年月（估）开始
      */
      */
-    @Schema(description = "出账日（估）开始 格式：yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate payoutDateStart;
+    @Schema(description = "出账年月（估）开始 格式：yyyy-MM")
+    private String payoutDateStart;
 
 
     /**
     /**
-     * 出账日（估）结束
+     * 出账年月（估）结束
      */
      */
-    @Schema(description = "出账日（估）结束 格式：yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate payoutDateEnd;
+    @Schema(description = "出账年月（估）结束 格式：yyyy-MM")
+    private String payoutDateEnd;
 
 
     /**
     /**
      * 检核年月
      * 检核年月

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

@@ -2,8 +2,6 @@ package com.yd.csf.service.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -20,7 +18,6 @@ import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RedisUtil;
 import com.yd.common.utils.RedisUtil;
-import com.yd.csf.feign.response.expectedfortune.ApiExpectedFortunePageResponse;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.model.*;
@@ -45,6 +42,8 @@ import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -93,8 +92,19 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         String policyNo = fortuneQueryRequest.getPolicyNo();
         String policyNo = fortuneQueryRequest.getPolicyNo();
         List<String> insuranceCompanyBizIdList = fortuneQueryRequest.getInsuranceCompanyBizIdList();
         List<String> insuranceCompanyBizIdList = fortuneQueryRequest.getInsuranceCompanyBizIdList();
         List<String> productLaunchBizIdList = fortuneQueryRequest.getProductLaunchBizIdList();
         List<String> productLaunchBizIdList = fortuneQueryRequest.getProductLaunchBizIdList();
-        LocalDate payoutDateStart = fortuneQueryRequest.getPayoutDateStart();
-        LocalDate payoutDateEnd = fortuneQueryRequest.getPayoutDateEnd();
+        // 出账年月（估）开始
+        LocalDate payoutDateStart = null;
+        if (StringUtils.isNotBlank(fortuneQueryRequest.getPayoutDateStart())) {
+            payoutDateStart = LocalDate.parse(fortuneQueryRequest.getPayoutDateStart() + "-01");
+        }
+        // 出账年月（估）结束 月最后一天
+        LocalDate payoutDateEnd = null;
+        if (StringUtils.isNotBlank(fortuneQueryRequest.getPayoutDateEnd())) {
+            // 1. 先解析为 YearMonth (专门处理年月)
+            YearMonth yearMonth = YearMonth.parse(fortuneQueryRequest.getPayoutDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM"));
+            // 2. 获取该月的最后一天
+            payoutDateEnd = yearMonth.atEndOfMonth();
+        }
         String brokerName = fortuneQueryRequest.getBrokerName();
         String brokerName = fortuneQueryRequest.getBrokerName();
 
 
         // 入账状态
         // 入账状态