前端对接问题修复61

f2c06b4b · jianan · a294758d · f2c06b4b · f2c06b4b · f2c06b4b
Commit f2c06b4b authored Jan 06, 2026 by jianan
8 changed files
--- a/yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
@@ -24,7 +24,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.List;
 import java.util.stream.Collectors;

--- a/yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
@@ -442,7 +442,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService 
        IPage<ExpectedFortune> iPage = iExpectedFortuneService.page(page, queryWrapper);
        // 查询统计数据
        List<ExpectedFortune> fortuneList = iExpectedFortuneService.list(queryWrapper);
-        ExpectedFortuneStatisticsVO statisticsVO = iExpectedFortuneService.getStatistics(fortuneList.stream().map(ExpectedFortune::getId).collect(Collectors.toList()));
+        ExpectedFortuneStatisticsVO statisticsVO = this.getStatistics(fortuneList.stream().map(ExpectedFortune::getId).collect(Collectors.toList()));
        // 组装返回结果
        ApiExpectedFortunePageResponseVO response = new ApiExpectedFortunePageResponseVO();
@@ -618,15 +618,17 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService 
        if (expectedFortune == null) {
            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计发佣数据不存在");
        }
-        BeanUtils.copyProperties(request, expectedFortune, "id", "expectedFortuneBizId");
+        ExpectedFortune updateExpectedFortune = new ExpectedFortune();
+        BeanUtils.copyProperties(request, updateExpectedFortune);
+        updateExpectedFortune.setId(expectedFortune.getId());
        // 获取当前登录用户
        AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
        String loginUserId = currentLoginUser.getId().toString();
-        expectedFortune.setUpdaterId(loginUserId);
+        updateExpectedFortune.setUpdaterId(loginUserId);
-        expectedFortune.setUpdateTime(LocalDateTime.now());
+        updateExpectedFortune.setUpdateTime(LocalDateTime.now());
-        iExpectedFortuneService.updateById(expectedFortune);
+        iExpectedFortuneService.updateById(updateExpectedFortune);
        return true;
    }

--- a/yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ExpectedFortuneAddRequest.java
+++ b/yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ExpectedFortuneAddRequest.java
@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.util.Date;
 @Data
 public class ExpectedFortuneAddRequest {
@@ -92,14 +92,14 @@ public class ExpectedFortuneAddRequest {
     */
    @Schema(description = "出账日 (估)")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate payoutDate;
+    private Date payoutDate;
    /**
     * 出账日 (实)
     */
    @Schema(description = "出账日 (实)")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate actualPayoutDate;
+    private Date actualPayoutDate;
    /**
     * 出账状态

--- a/yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ExpectedFortuneUpdateRequest.java
+++ b/yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ExpectedFortuneUpdateRequest.java
 package com.yd.csf.feign.request.expectedfortune;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.math.BigDecimal;
+import java.util.Date;
 @Data
 public class ExpectedFortuneUpdateRequest {
@@ -14,6 +16,32 @@ public class ExpectedFortuneUpdateRequest {
    private String expectedFortuneBizId;
    /**
+     * 应付款类型 R-关联保单应付款 U-非关联保单应付款
+     */
+    @Schema(description = "应付款类型 R-关联保单应付款 U-非关联保单应付款")
+    private String fortuneBizType;
+    /**
+     * 出账日 (估)
+     */
+    @Schema(description = "出账日 (估)")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date payoutDate;
+    /**
+     * 出账日 (实)
+     */
+    @Schema(description = "出账日 (实)")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date actualPayoutDate;
+    /**
+     * 出账金额
+     */
+    @Schema(description = "出账金额")
+    private BigDecimal amount;
+    /**
     * 出账状态
     */
    @Schema(description = "出账状态 0=待出账 1=可出帐，待检核 2=完成出账 3=部分出账 4=保留 5=已失效 6=可出帐，检核完成 7=未找到当前预计发佣对应的来佣, 字典值: csf_expected_fortune_status")
@@ -32,12 +60,36 @@ public class ExpectedFortuneUpdateRequest {
    private BigDecimal currentPaymentAmount;
    /**
+     * 出账项目
+     */
+    @Schema(description = "出账项目")
+    private String fortuneName;
+    /**
+     * 出账项目类型
+     */
+    @Schema(description = "出账项目类型 字典值：csf_fortune_type")
+    private String fortuneType;
+    /**
     * 币种
     */
    @Schema(description = "币种")
    private String currency;
    /**
+     * 转介人名称
+     */
+    @Schema(description = "转介人名称")
+    private String broker;
+    /**
+     * 转介人业务ID
+     */
+    @Schema(description = "broker biz id")
+    private String brokerBizId;
+    /**
     * 备注
     */
    @Schema(description = "备注")

--- a/yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedAddDto.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedAddDto.java
@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.util.Date;
 @Data
 public class CommissionExpectedAddDto {
@@ -98,14 +98,14 @@ public class CommissionExpectedAddDto {
     */
    @Schema(description = "入账日 (估) format:yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate commissionDate;
+    private Date commissionDate;
    /**
     * 入账日 (实)
     */
    @Schema(description = "入账日 (实) format:yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate actualCommissionDate;
+    private Date actualCommissionDate;
    /**
     * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
@@ -130,6 +130,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        Set<String> commissionExpectedBizIdSet = commissionList.stream().map(Commission::getCommissionExpectedBizId).collect(Collectors.toSet());
        List<CommissionExpected> commissionExpectedList = commissionExpectedService.lambdaQuery()
                .select(CommissionExpected::getCommissionExpectedBizId,
+                        CommissionExpected::getCommissionRatio,
                        CommissionExpected::getPaidAmount,
                        CommissionExpected::getPaidRatio,
                        CommissionExpected::getStatus,
@@ -151,8 +152,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
            }
            CommissionExpected commissionExpected = commissionExpectedMap.get(commission.getCommissionExpectedBizId());
            if (commissionExpected != null) {
-                // 填充应收账款编号
+                // 填充应收账款编号、已入账比例、待入账比例
                commissionVO.setReceivableNo(commissionExpected.getReceivableNo());
+                if (commissionExpected.getCommissionRatio() != null) {
+                    commissionVO.setPaidRatio(commissionExpected.getPaidRatio());
+                    commissionVO.setPendingRatio(commissionExpected.getCommissionRatio().subtract(commissionExpected.getPaidRatio()));
+                }
                commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus());
            }
            return commissionVO;

--- a/yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedVO.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedVO.java
@@ -5,6 +5,7 @@ import com.yd.csf.service.model.Commission;
 import com.yd.csf.service.model.CommissionExpected;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import java.io.Serializable;
@@ -174,6 +175,18 @@ public class CommissionExpectedVO implements Serializable {
    private BigDecimal paidRatio;
    /**
+     * 待入账金额
+     */
+    @Schema(description = "待入账金额")
+    private BigDecimal pendingAmount;
+    /**
+     * 待入账比例
+     */
+    @Schema(description = "待入账比例")
+    private BigDecimal pendingRatio;
+    /**
     * 已入账来佣列表
     */
    @Schema(description = "已入账来佣列表")
@@ -226,6 +239,22 @@ public class CommissionExpectedVO implements Serializable {
        CommissionExpectedVO commissionVO = new CommissionExpectedVO();
        BeanUtils.copyProperties(commissionExpected, commissionVO);
+        BigDecimal paidAmount1 = ObjectUtils.defaultIfNull(commissionExpected.getPaidAmount(), BigDecimal.ZERO);
+        BigDecimal paidRatio1 = ObjectUtils.defaultIfNull(commissionExpected.getPaidRatio(), BigDecimal.ZERO);
+        // 待入账比例、待入账金额
+        if (commissionExpected.getCommissionRatio() != null) {
+            commissionVO.setPaidRatio(paidRatio1);
+            commissionVO.setPendingRatio(commissionExpected.getCommissionRatio().subtract(paidRatio1));
+            if (commissionExpected.getExpectedAmount() != null) {
+                commissionVO.setPaidAmount(paidAmount1);
+                commissionVO.setPendingAmount(commissionExpected.getExpectedAmount().subtract(paidAmount1));
+            }
+        } else if (commissionExpected.getAmount() != null) {
+            commissionVO.setPaidAmount(paidAmount1);
+            commissionVO.setPendingAmount(commissionExpected.getAmount().subtract(paidAmount1));
+        }
        return commissionVO;
    }
 }
--- a/yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionVO.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionVO.java
@@ -177,16 +177,16 @@ public class CommissionVO implements Serializable {
    private String expectedAmount;
    /**
-     * 已入账金额
+     * 累计入账比例
     */
-    @Schema(description = "已入账金额")
+    @Schema(description = "累计入账比例")
-    private String paidAmount;
+    private BigDecimal paidRatio;
    /**
-     * 待入账金额
+     * 待入账比例
     */
-    @Schema(description = "待入账金额")
+    @Schema(description = "待入账比例")
-    private String pendingAmount;
+    private BigDecimal pendingRatio;
    /**
     * 通用备注