push

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

@@ -72,6 +72,18 @@ public class FortuneQueryRequest extends PageDto implements Serializable {
     private String payoutDateEnd;
     private String payoutDateEnd;
 
 
     /**
     /**
+     * 出账年月（实）开始
+     */
+    @Schema(description = "出账年月（实）开始 格式：yyyy-MM")
+    private String actualPayoutDateStart;
+
+    /**
+     * 出账年月（实）结束
+     */
+    @Schema(description = "出账年月（实）结束 格式：yyyy-MM")
+    private String actualPayoutDateEnd;
+
+    /**
      * 检核年月
      * 检核年月
      */
      */
     @Schema(description = "检核年月，格式：yyyy-MM")
     @Schema(description = "检核年月，格式：yyyy-MM")

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

@@ -105,6 +105,21 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             // 2. 获取该月的最后一天
             // 2. 获取该月的最后一天
             payoutDateEnd = yearMonth.atEndOfMonth();
             payoutDateEnd = yearMonth.atEndOfMonth();
         }
         }
+
+        // 出账年月（实）开始
+        LocalDate actualPayoutDateStart = null;
+        if (StringUtils.isNotBlank(fortuneQueryRequest.getActualPayoutDateStart())) {
+            actualPayoutDateStart = LocalDate.parse(fortuneQueryRequest.getActualPayoutDateStart() + "-01");
+        }
+        // 出账年月（实）结束 月最后一天
+        LocalDate actualPayoutDateEnd = null;
+        if (StringUtils.isNotBlank(fortuneQueryRequest.getActualPayoutDateEnd())) {
+            // 1. 先解析为 YearMonth (专门处理年月)
+            YearMonth yearMonth = YearMonth.parse(fortuneQueryRequest.getActualPayoutDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM"));
+            // 2. 获取该月的最后一天
+            actualPayoutDateEnd = yearMonth.atEndOfMonth();
+        }
+
         String brokerName = fortuneQueryRequest.getBrokerName();
         String brokerName = fortuneQueryRequest.getBrokerName();
 
 
         // 入账状态
         // 入账状态
@@ -118,6 +133,10 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
 
         queryWrapper.ge(ObjectUtils.isNotEmpty(payoutDateStart), "payout_date", payoutDateStart);
         queryWrapper.ge(ObjectUtils.isNotEmpty(payoutDateStart), "payout_date", payoutDateStart);
         queryWrapper.le(ObjectUtils.isNotEmpty(payoutDateEnd), "payout_date", payoutDateEnd);
         queryWrapper.le(ObjectUtils.isNotEmpty(payoutDateEnd), "payout_date", payoutDateEnd);
+
+        queryWrapper.ge(ObjectUtils.isNotEmpty(actualPayoutDateStart), "actual_payout_date", actualPayoutDateStart);
+        queryWrapper.le(ObjectUtils.isNotEmpty(actualPayoutDateEnd), "actual_payout_date", actualPayoutDateEnd);
+
         queryWrapper.like(StringUtils.isNotBlank(brokerName), "broker", "%" + brokerName + "%");
         queryWrapper.like(StringUtils.isNotBlank(brokerName), "broker", "%" + brokerName + "%");
 
 
         // 入账状态, 关联查询 commission_expected 表
         // 入账状态, 关联查询 commission_expected 表