前端对接问题修复16

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java

@@ -225,8 +225,8 @@ public class ApiCommissionController {
     @Operation(summary = "生成实际出账（发佣）记录")
     @Operation(summary = "生成实际出账（发佣）记录")
     public Result<Boolean> generateFortune(@RequestBody GenerateFortuneRequest generateFortuneRequest,
     public Result<Boolean> generateFortune(@RequestBody GenerateFortuneRequest generateFortuneRequest,
                                            HttpServletRequest request) {
                                            HttpServletRequest request) {
-        if (CollectionUtils.isEmpty(generateFortuneRequest.getPolicyNoList())) {
-            return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "保单号列表不能为空");
+        if (ObjectUtils.isEmpty(generateFortuneRequest.getPayoutYearMonth())) {
+            return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "预计出账年月不能为空");
         }
         }
         return Result.success(commissionService.generateFortune(generateFortuneRequest));
         return Result.success(commissionService.generateFortune(generateFortuneRequest));
     }
     }

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

@@ -10,16 +10,13 @@ import java.util.List;
 @Data
 @Data
 public class GenerateFortuneRequest {
 public class GenerateFortuneRequest {
 
 
-    @Schema(description = "保单号列表")
-    private List<String> policyNoList;
-
 //    @Schema(description = "入账业务id列表")
 //    @Schema(description = "入账业务id列表")
 //    private List<String> commissionBizIdList;
 //    private List<String> commissionBizIdList;
-//
+
 //    @Schema(description = "expected fortune id 列表")
 //    @Schema(description = "expected fortune id 列表")
 //    private List<Long> expectedFortuneIdList;
 //    private List<Long> expectedFortuneIdList;
 
 
-//    @Schema(description = "检核年月，格式：yyyy-MM")
-//    @JsonFormat(pattern = "yyyy-MM")
-//    private LocalDate payoutYearMonth;
+    @Schema(description = "预计出账年月，格式：yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
+    private LocalDate payoutYearMonth;
 }
 }

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

@@ -332,25 +332,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public Boolean generateFortune(GenerateFortuneRequest generateFortuneRequest) {
     public Boolean generateFortune(GenerateFortuneRequest generateFortuneRequest) {
-        // 查询所有保单号对应的入账记录
-        List<String> policyNoList = generateFortuneRequest.getPolicyNoList();
-        QueryWrapper<Commission> queryWrapperCommission = new QueryWrapper<>();
-        queryWrapperCommission.in("policy_no", policyNoList);
-        queryWrapperCommission.orderByAsc("reconciliation_year_month");
-        List<Commission> commissionList0 = this.list(queryWrapperCommission);
-        if (CollectionUtils.isEmpty(commissionList0)) {
-            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "根据保单号查询对应的入账记录失败");
-        }
-        // 获取最新的检核年月
-        String currentYearMonth = null;
-        for (Commission commission : commissionList0) {
-            if (StringUtils.isNotBlank(commission.getReconciliationYearMonth())) {
-                currentYearMonth = commission.getReconciliationYearMonth();
-                break;
-            }
-        }
-
-        LocalDate payoutYearMonth = LocalDate.parse(currentYearMonth + "-01", DateTimeFormatter.ofPattern("yyyy-MM"));
+        LocalDate payoutYearMonth = generateFortuneRequest.getPayoutYearMonth();
         if (ObjectUtils.isEmpty(payoutYearMonth)) {
         if (ObjectUtils.isEmpty(payoutYearMonth)) {
             throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "请选择预计出账年月");
             throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "请选择预计出账年月");
         }
         }