前端对接问题修复6

ef39bb00 · jianan · e01897ce · ef39bb00 · ef39bb00 · ef39bb00
Commit ef39bb00 authored Dec 26, 2025 by jianan
12 changed files
--- 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
@@ -569,7 +569,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService 
            statisticsVO.setTotalExpectedAmount(BigDecimal.ZERO);
            statisticsVO.setTotalPaidAmount(BigDecimal.ZERO);
            statisticsVO.setTotalUnpaidAmount(BigDecimal.ZERO);
-            statisticsVO.setPaidAmountRatio("0.00%");
+            statisticsVO.setPaidAmountRatio(BigDecimal.ZERO);
            statisticsVO.setTotalPolicyCount(0);
            return statisticsVO;
        }
@@ -583,10 +583,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService 
        // 计算已出账比例（已出账金额/预计发佣金额）
        BigDecimal divided = BigDecimal.ZERO;
        if (totalAmount.compareTo(BigDecimal.ZERO) > 0) {
-            divided = totalPaidAmount.divide(totalAmount, 4, RoundingMode.HALF_UP);
+            divided = totalPaidAmount.divide(totalAmount, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
        }
-        // 格式化 %
+        statisticsVO.setPaidAmountRatio(divided);
-        statisticsVO.setPaidAmountRatio(String.format("%.2f%%", divided.doubleValue() * 100));
        return statisticsVO;
    }

--- 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
@@ -72,7 +72,7 @@ public class ExpectedFortuneAddRequest {
    /**
     * 出账项目类型
     */
-    @Schema(description = "出账项目类型")
+    @Schema(description = "出账项目类型 字典值：csf_fortune_type")
    private String fortuneType;
    /**

--- 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
@@ -110,7 +110,7 @@ public class CommissionExpectedAddDto {
    /**
     * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效
     */
-    @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_commission_expected_status")
+    @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_expected_commission_status")
    private String status;
    /**

--- a/yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedQueryRequest.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedQueryRequest.java
@@ -19,7 +19,7 @@ public class CommissionExpectedQueryRequest extends PageDto {
    /**
     * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选
     */
-    @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选，字典值: csf_commission_expected_status")
+    @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选，字典值: csf_expected_commission_status")
    private List<String> statusList;
    /**

--- a/yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAccountAddRequest.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAccountAddRequest.java
@@ -17,12 +17,24 @@ public class FortuneAccountAddRequest implements Serializable {
    private String broker;
    /**
+     * 转介人业务ID
+     */
+    @Schema(description = "转介人业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String brokerBizId;
+    /**
     * 所属团队
     */
    @Schema(description = "所属团队", requiredMode = Schema.RequiredMode.REQUIRED)
    private String team;
    /**
+     * 所属团队业务ID
+     */
+    @Schema(description = "所属团队业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String teamBizId;
+    /**
     * 出账币种
     */
    @Schema(description = "出账币种", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -41,10 +53,10 @@ public class FortuneAccountAddRequest implements Serializable {
    private String status;
    /**
-     * 出账日期
+     * 完成出账日期
     */
-    @Schema(description = "出账日期", requiredMode = Schema.RequiredMode.REQUIRED, example = "2025-09-19", format = "date")
+    @Schema(description = "完成出账日期", requiredMode = Schema.RequiredMode.REQUIRED, example = "2025-09-19", format = "date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date fortuneAccountDate;
    /**

--- a/yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAccountQueryRequest.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAccountQueryRequest.java
@@ -6,16 +6,23 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 @Data
 public class FortuneAccountQueryRequest extends PageDto {
-    @Schema(description = "转介人")
+    @Schema(description = "转介人名称")
    private String broker;
-    @Schema(description = "所属团队")
+    @Schema(description = "转介人业务ID列表")
+    private List<String> brokerBizIdList;
+    @Schema(description = "所属团队名称")
    private String team;
+    @Schema(description = "所属团队业务ID列表")
+    private List<String> teamBizIdList;
    @Schema(description = "出账状态 字典值：csf_fortune_account_status")
    private String status;

--- a/yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionExpected.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionExpected.java
@@ -118,7 +118,7 @@ public class CommissionExpected implements Serializable {
    private Date actualCommissionDate;
    /**
-     * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_commission_expected_status
+     * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_expected_commission_status
     */
    private String status;

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
@@ -319,7 +319,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
            expectedStatisticsVO.setTotalAmount(BigDecimal.ZERO);
            expectedStatisticsVO.setTotalPaidAmount(BigDecimal.ZERO);
            expectedStatisticsVO.setPendingPaidAmount(BigDecimal.ZERO);
-            expectedStatisticsVO.setPaidAmountRatio("0.00%");
+            expectedStatisticsVO.setPaidAmountRatio(BigDecimal.ZERO);
            expectedStatisticsVO.setTotalPolicyCount(0);
            return expectedStatisticsVO;
        }
@@ -333,10 +333,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
        // 计算已入账比例
        BigDecimal divided = BigDecimal.ZERO;
        if (totalAmount.compareTo(BigDecimal.ZERO) > 0) {
-            divided = totalPaidAmount.divide(totalAmount, 4, RoundingMode.HALF_UP);
+            divided = totalPaidAmount.divide(totalAmount, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
        }
-        // 格式化 %
+        commissionStatistics.setPaidAmountRatio(divided);
-        commissionStatistics.setPaidAmountRatio(String.format("%.2f%%", divided.doubleValue() * 100));
        return commissionStatistics;
    }

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java
@@ -27,6 +27,8 @@ import com.yd.csf.service.service.IExpectedFortuneService;
 import com.yd.csf.service.vo.FortuneAccountVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +64,11 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
        if (fortuneAccountQueryRequest == null) {
            return queryWrapper;
        }
+        List<String> brokerBizIdList = fortuneAccountQueryRequest.getBrokerBizIdList();
+        List<String> teamBizIdList = fortuneAccountQueryRequest.getTeamBizIdList();
+        queryWrapper.in(CollectionUtils.isNotEmpty(brokerBizIdList), "broker_biz_id", brokerBizIdList);
+        queryWrapper.in(CollectionUtils.isNotEmpty(teamBizIdList), "team_biz_id", teamBizIdList);
        queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getBroker()), "broker", fortuneAccountQueryRequest.getBroker());
        queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getTeam()), "team", fortuneAccountQueryRequest.getTeam());
        queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getStatus()), "status", fortuneAccountQueryRequest.getStatus());
@@ -171,13 +178,9 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
        Long loginUserId = currentLoginUser.getId();
        FortuneAccount fortuneAccount = new FortuneAccount();
+        BeanUtils.copyProperties(fortuneAccountAddRequest, fortuneAccount);
        fortuneAccount.setFortuneAccountBizId(RandomStringGenerator.generateBizId16("fortune_account"));
-        fortuneAccount.setBroker(fortuneAccountAddRequest.getBroker());
-        fortuneAccount.setTeam(fortuneAccountAddRequest.getTeam());
-        fortuneAccount.setCurrency(fortuneAccountAddRequest.getCurrency());
-        fortuneAccount.setAmount(fortuneAccountAddRequest.getAmount());
-        fortuneAccount.setFortuneAccountDate(fortuneAccountAddRequest.getFortuneAccountDate());
-        fortuneAccount.setStatus(fortuneAccountAddRequest.getStatus());
        fortuneAccount.setRemark(fortuneAccountAddRequest.getRemark());
        fortuneAccount.setCreatorId(loginUserId.toString());
        fortuneAccount.setUpdaterId(loginUserId.toString());
@@ -201,12 +204,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
        // 保存修改记录
        saveUpdateFortuneAccountRecord(fortuneAccount, fortuneAccountUpdateRequest);
-        fortuneAccount.setBroker(fortuneAccountUpdateRequest.getBroker());
+        BeanUtils.copyProperties(fortuneAccountUpdateRequest, fortuneAccount, "fortuneAccountBizId");
-        fortuneAccount.setTeam(fortuneAccountUpdateRequest.getTeam());
-        fortuneAccount.setCurrency(fortuneAccountUpdateRequest.getCurrency());
-        fortuneAccount.setAmount(fortuneAccountUpdateRequest.getAmount());
-        fortuneAccount.setFortuneAccountDate(fortuneAccountUpdateRequest.getFortuneAccountDate());
-        fortuneAccount.setRemark(fortuneAccountUpdateRequest.getRemark());
        fortuneAccount.setUpdaterId(loginUserId.toString());
        fortuneAccount.setUpdateTime(new Date());
@@ -262,6 +260,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
        // 更新 FortuneAccount 状态为已出账
        for (FortuneAccount fortuneAccount : fortuneAccountList) {
            fortuneAccount.setStatus(FortuneAccountStatusEnum.SENT.getItemValue());
+            fortuneAccount.setFortuneAccountDate(new Date());
            fortuneAccount.setUpdaterId(loginUserId.toString());
            fortuneAccount.setUpdateTime(new Date());
        }

--- a/yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedStatisticsVO.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedStatisticsVO.java
@@ -29,10 +29,10 @@ public class CommissionExpectedStatisticsVO {
    private BigDecimal pendingPaidAmount;
    /**
-     * 已入账比例（已入账金额/总金额）
+     * 已入账比例 %（已入账金额/总金额）
     */
-    @Schema(description = "已入账比例（已入账金额/总金额）")
+    @Schema(description = "已入账比例 %（已入账金额/总金额）")
-    private String paidAmountRatio;
+    private BigDecimal paidAmountRatio;
    /**
     * 总保单数

--- 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
@@ -122,7 +122,7 @@ public class CommissionExpectedVO implements Serializable {
    /**
     * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效
     */
-    @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_commission_expected_status")
+    @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_expected_commission_status")
    private String status;
    /**

--- a/yd-csf-service/src/main/java/com/yd/csf/service/vo/ExpectedFortuneStatisticsVO.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/vo/ExpectedFortuneStatisticsVO.java
@@ -33,7 +33,7 @@ public class ExpectedFortuneStatisticsVO {
     * 已出账比例（已出账金额/预计发佣金额）
     */
    @Schema(description = "已出账比例（已出账金额/预计发佣金额）")
-    private String paidAmountRatio;
+    private BigDecimal paidAmountRatio;
    /**
     * 总保单数