应付款管理-根据产品、保司、团队查询，应收款管理-根据入账日查询

4d31f918 · jianan · 4e7077da · 4d31f918 · 4d31f918 · 4d31f918
Commit 4d31f918 authored Mar 12, 2026 by jianan
6 changed files
--- a/yd-csf-api/src/main/java/com/yd/csf/api/dto/GenerateExpectedFortuneDto.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/dto/GenerateExpectedFortuneDto.java
@@ -31,6 +31,16 @@ public class GenerateExpectedFortuneDto {
    private String policyNo;
    /**
+     * 产品业务id
+     */
+    private String productLaunchBizId;
+    /**
+     * 保险公司业务id
+     */
+    private String insuranceCompanyBizId;
+    /**
     * 发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
     */
    private Integer fortunePeriod;

--- 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
@@ -630,10 +630,14 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService 
                .status(FortuneStatusEnum.WAIT.getItemValue())
                //期交保费
                .paymentPremium(brokerDto.getPaymentPremium())
-                //所属团队 TODO
+                //所属团队
-//                .team()
+                .team(brokerDto.getTeam())
-                //所属团队业务ID TODO
+                //所属团队业务ID
-//                .teamBizId()
+                .teamBizId(brokerDto.getTeamBizId())
+                //产品业务id
+                .productLaunchBizId(brokerDto.getPlanBizId())
+                //保险公司业务id
+                .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
                .build());
        return Result.success();
@@ -700,10 +704,14 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService 
                .status(FortuneStatusEnum.WAIT.getItemValue())
                //期交保费
                .paymentPremium(brokerDto.getPaymentPremium())
-                //所属团队 TODO
+                //所属团队
-//                .team()
+                .team(brokerDto.getTeam())
-                //所属团队业务ID TODO
+                //所属团队业务ID
-//                .teamBizId()
+                .teamBizId(brokerDto.getTeamBizId())
+                //产品业务id
+                .productLaunchBizId(brokerDto.getPlanBizId())
+                //保险公司业务id
+                .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
                .build());
        return Result.success();
@@ -743,6 +751,14 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService 
                fortune.setBroker(fortuneDto.getBroker());
                //转介人业务ID (获得积分的业务员)
                fortune.setBrokerBizId(fortuneDto.getBrokerBizId());
+                //所属团队
+                fortune.setTeam(fortuneDto.getTeam());
+                //所属团队业务ID
+                fortune.setTeamBizId(fortuneDto.getTeamBizId());
+                //产品业务id
+                fortune.setProductLaunchBizId(fortuneDto.getProductLaunchBizId());
+                //保险公司业务id
+                fortune.setInsuranceCompanyBizId(fortuneDto.getInsuranceCompanyBizId());
                //出账项目名称 -> 基本法项目名称
                fortune.setFortuneName(algorithmResDto.getItemName());
                //保单预计发佣业务id

--- 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
 package com.yd.csf.service.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yd.common.dto.PageDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
@@ -32,15 +32,13 @@ public class CommissionExpectedQueryRequest extends PageDto {
     * 预计入账日期开始 格式：yyyy-MM-dd
     */
    @Schema(description = "预计入账日期开始 格式：yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate commissionDateStart;
-    private Date commissionDateStart;
    /**
     * 预计入账日期结束 格式：yyyy-MM-dd
     */
    @Schema(description = "预计入账日期结束 格式：yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate commissionDateEnd;
-    private Date commissionDateEnd;
    /**
     * 入账期数

--- a/yd-csf-service/src/main/java/com/yd/csf/service/dto/QueryPolicyAndBrokerDto.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dto/QueryPolicyAndBrokerDto.java
@@ -35,6 +35,11 @@ public class QueryPolicyAndBrokerDto {
    private String productCode;
    /**
+     * 保险公司业务id
+     */
+    private String insuranceCompanyBizId;
+    /**
     * 供款年期（字典）
     */
    private Integer paymentTerm;

--- 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
@@ -297,8 +297,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
        List<String> insurerCompanyBizIdList = commissionExpectedQueryRequest.getInsurerCompanyBizIdList();
        List<String> reconciliationCompanyBizIdList = commissionExpectedQueryRequest.getReconciliationCompanyBizIdList();
        List<String> statusList = commissionExpectedQueryRequest.getStatusList();
-        Date commissionDateStart = commissionExpectedQueryRequest.getCommissionDateStart();
+        LocalDate commissionDateStart = commissionExpectedQueryRequest.getCommissionDateStart();
-        Date commissionDateEnd = commissionExpectedQueryRequest.getCommissionDateEnd();
+        LocalDate commissionDateEnd = commissionExpectedQueryRequest.getCommissionDateEnd();
        Integer commissionPeriod = commissionExpectedQueryRequest.getCommissionPeriod();
        String productLaunchBizId = commissionExpectedQueryRequest.getProductLaunchBizId();
        String commissionBizType = commissionExpectedQueryRequest.getCommissionBizType();
@@ -314,8 +314,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
        queryWrapper.eq(ObjectUtils.isNotEmpty(commissionBizType), "commission_biz_type", commissionBizType);
        queryWrapper.in(ObjectUtils.isNotEmpty(statusList), "status", statusList);
        // 范围查询
-        queryWrapper.gt(ObjectUtils.isNotEmpty(commissionDateStart), "commission_date", commissionDateStart);
+        queryWrapper.ge(ObjectUtils.isNotEmpty(commissionDateStart), "commission_date", commissionDateStart);
-        queryWrapper.lt(ObjectUtils.isNotEmpty(commissionDateEnd), "commission_date", commissionDateEnd);
+        queryWrapper.le(ObjectUtils.isNotEmpty(commissionDateEnd), "commission_date", commissionDateEnd);
        // 转介人所属团队业务ID 关联保单表查询
        if (StringUtils.isNotBlank(teamBizId)) {
            queryWrapper.apply("EXISTS (SELECT 1 FROM policy_broker pb WHERE pb.policy_no = commission_expected.policy_no AND pb.team_biz_id = {0})",

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java
@@ -517,6 +517,9 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
            policy.setReconciliationCompanyBizId(policyFollow.getReconciliationCompanyBizId());
            policy.setReconciliationCompanyCode(policyFollow.getReconciliationCompanyCode());
            policy.setReconciliationCompany(policyFollow.getReconciliationCompany());
+            policy.setInsuranceCompanyBizId(policyFollow.getInsuranceCompanyBizId());
+            policy.setInsuranceCompany(policyFollow.getInsuranceCompany());
+            policy.setProductName(policyFollow.getProductName());
            // 更新保单状态为生效
            policy.setStatus(PolicyStatusEnum.INFORCE.getItemValue());
            // 手动映射不同名的字段
@@ -529,16 +532,20 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
            //冷静期结束日期
            policy.setCoolingOffEndDate(changePolicyFollowStatusRequest.getCoolingOffEndDate() != null ? changePolicyFollowStatusRequest.getCoolingOffEndDate() : policy.getCoolingOffEndDate());
-            if (ObjectUtils.isEmpty(policy.getInsuranceCompany()) || ObjectUtils.isEmpty(policy.getInsuranceCompany())) {
+            if (ObjectUtils.isEmpty(policy.getInsuranceCompany()) || ObjectUtils.isEmpty(policy.getInsuranceCompanyBizId())) {
                // 获取保单产品信息，填充对账公司相关字段
                PolicyProductInfo productInfo = getPolicyProductInfo(policyFollow.getProductLaunchBizId());
                if (productInfo != null) {
-                    policy.setInsuranceCompany(productInfo.getInsuranceCompany());
+                    if (ObjectUtils.isNotEmpty(productInfo.getInsuranceCompany())) {
-                    policy.setInsuranceCompanyBizId(productInfo.getInsuranceCompanyBizId());
+                        policy.setInsuranceCompany(productInfo.getInsuranceCompany());
-                    if (ObjectUtils.isEmpty(policy.getReconciliationCompany())) {
+                    }
+                    if (ObjectUtils.isNotEmpty(productInfo.getInsuranceCompanyBizId())) {
+                        policy.setInsuranceCompanyBizId(productInfo.getInsuranceCompanyBizId());
+                    }
+                    if (ObjectUtils.isNotEmpty(productInfo.getReconciliationCompanyBizId())) {
                        policy.setReconciliationCompany(productInfo.getReconciliationCompany());
                    }
-                    if (ObjectUtils.isEmpty(policy.getReconciliationCompanyBizId())) {
+                    if (ObjectUtils.isNotEmpty(productInfo.getReconciliationCompanyBizId())) {
                        policy.setReconciliationCompanyBizId(productInfo.getReconciliationCompanyBizId());
                    }
                }