前端对接问题修复1

1bbbae65 · jianan · 589f6169 · 1bbbae65 · 1bbbae65 · 1bbbae65
Commit 1bbbae65 authored Dec 25, 2025 by jianan
7 changed files
--- a/yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java
@@ -21,6 +21,7 @@ import com.yd.csf.service.vo.CommissionStatisticsVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -252,16 +253,18 @@ public class ApiCommissionController {
     * 来佣比对记录列表
     */
    @PostMapping("/compare/records")
-    @Operation(summary = "来佣比对记录列表")
+    @Operation(summary = "来佣比对记录列表", description = "可根据实际来佣业务id、预计来佣业务id，查询来佣比对记录")
    public Result<Page<CommissionCompareRecord>> getCommissionCompareRecords(@RequestBody CommissionCompareRecordQueryRequest queryRequest) {
        if (StringUtils.isBlank(queryRequest.getCommissionBizId())) {
            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "commissionBizId不能为空");
        }
        // 查询来佣比对记录
+        QueryWrapper<CommissionCompareRecord> queryWrapper = new QueryWrapper<CommissionCompareRecord>();
+        queryWrapper.eq(ObjectUtils.isNotEmpty(queryRequest.getCommissionBizId()), "commission_biz_id", queryRequest.getCommissionBizId());
+        queryWrapper.eq(ObjectUtils.isNotEmpty(queryRequest.getCommissionExpectedBizId()), "commission_expected_biz_id", queryRequest.getCommissionExpectedBizId());
+        queryWrapper.orderByAsc("create_time");
        Page<CommissionCompareRecord> page = commissionCompareRecordService.page(new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()),
-                new LambdaQueryWrapper<CommissionCompareRecord>()
+                queryWrapper);
-                        .eq(CommissionCompareRecord::getCommissionBizId, queryRequest.getCommissionBizId())
-                        .orderByAsc(CommissionCompareRecord::getCreateTime));
        return Result.success(page);
    }

--- a/yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionCompareRecordQueryRequest.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionCompareRecordQueryRequest.java
@@ -9,6 +9,12 @@ public class CommissionCompareRecordQueryRequest extends PageDto {
    /**
     * 来佣业务ID
     */
-    @Schema(description = "来佣业务ID")
+    @Schema(description = "来佣业务id (commission：来佣记录、入账记录、实际来佣记录、实际入账记录)")
    private String commissionBizId;
+    /**
+     * 预计来佣业务id
+     */
+    @Schema(description = "预计来佣业务id (commissionExpected：预计来佣记录、预计入账记录、应收记录)")
+    private String commissionExpectedBizId;
 }
--- a/yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionQueryRequest.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionQueryRequest.java
@@ -8,20 +8,25 @@ import lombok.EqualsAndHashCode;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 /**
 * 查询commission请求
- *
 */
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class CommissionQueryRequest extends PageDto implements Serializable {
+    /**
+     * 检核年月
+     */
+    @Schema(description = "检核年月 格式: yyyy-MM")
+    private String reconciliationYearMonth;
    /**
-     * 来佣状态
+     * 比对状态
     */
-    @Schema(description = "来佣状态 '1'-'已比对','2'-'部分来佣', 字典值: csf_commission_status")
+    @Schema(description = "比对状态 '0'-'未比对','1'-'比对成功','2'-'比对失败', 字典值: csf_commission_status")
-    private String status;
+    private List<String> statusList;
    /**
     * 保单号
@@ -30,22 +35,28 @@ public class CommissionQueryRequest extends PageDto implements Serializable {
    private String policyNo;
    /**
-     * 对账公司名称
+     * 对账公司业务id列表
+     */
+    @Schema(description = "对账公司业务id列表")
+    private List<String> reconciliationCompanyBizIdList;
+    /**
+     * 保险公司业务id列表
     */
-    @Schema(description = "对账公司名称")
+    @Schema(description = "保险公司业务id列表")
-    private String reconciliationCompany;
+    private List<String> insuranceCompanyBizIdList;
    /**
     * 来佣日期开始
     */
-    @Schema(description = "来佣日期开始", example = "2023-01-01",format = "yyyy-MM-dd")
+    @Schema(description = "来佣日期开始", example = "2023-01-01", format = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date commissionDateStart;
    /**
     * 来佣日期结束
     */
-    @Schema(description = "来佣日期结束", example = "2023-01-01",format = "yyyy-MM-dd")
+    @Schema(description = "来佣日期结束", example = "2023-01-01", format = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date commissionDateEnd;

--- a/yd-csf-service/src/main/java/com/yd/csf/service/model/Commission.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/model/Commission.java
@@ -42,11 +42,16 @@ public class Commission implements Serializable {
    private String policyNo;
     /**
-     * 保费
+     * 期交保费
     */
    private String premium;
    /**
+     * 保险公司 id
+     */
+    private String insuranceCompanyBizId;
+    /**
     * 对账公司
     */
    private String reconciliationCompany;
@@ -62,6 +67,11 @@ public class Commission implements Serializable {
    private String reconciliationCompanyBizId;
    /**
+     * 产品计划 id
+     */
+    private String productLaunchBizId;
+    /**
     * 佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
     */
    private Integer commissionPeriod;

--- 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
@@ -82,16 +82,22 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
            return queryWrapper;
        }
-        String status = commissionQueryRequest.getStatus();
+        String reconciliationYearMonth = commissionQueryRequest.getReconciliationYearMonth();
+        List<String> statusList = commissionQueryRequest.getStatusList();
        String policyNo = commissionQueryRequest.getPolicyNo();
-        String reconciliationCompany = commissionQueryRequest.getReconciliationCompany();
+        List<String> insuranceCompanyBizIdList = commissionQueryRequest.getInsuranceCompanyBizIdList();
+        List<String> reconciliationCompanyBizIdList = commissionQueryRequest.getReconciliationCompanyBizIdList();
        Date commissionDateStart = commissionQueryRequest.getCommissionDateStart();
        Date commissionDateEnd = commissionQueryRequest.getCommissionDateEnd();
        Date expectedDate = commissionQueryRequest.getExpectedDate();
-        queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
+        // 查询对账年月
+        queryWrapper.eq(StringUtils.isNotBlank(reconciliationYearMonth), "reconciliation_year_month", reconciliationYearMonth);
+        queryWrapper.in(CollectionUtils.isNotEmpty(statusList), "status", statusList);
        queryWrapper.like(StringUtils.isNotBlank(policyNo), "policy_no", policyNo);
-        queryWrapper.like(StringUtils.isNotBlank(reconciliationCompany), "reconciliation_company", reconciliationCompany);
+        queryWrapper.in(CollectionUtils.isNotEmpty(insuranceCompanyBizIdList), "insurance_company_biz_id", insuranceCompanyBizIdList);
+        queryWrapper.in(CollectionUtils.isNotEmpty(reconciliationCompanyBizIdList), "reconciliation_company_biz_id", reconciliationCompanyBizIdList);
        if (commissionDateStart != null && commissionDateEnd != null) {
            queryWrapper.between("commission_date", commissionDateStart, commissionDateEnd);

--- 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
@@ -16,7 +16,7 @@ public class CommissionVO implements Serializable {
    /**
     * commission id
     */
-    @Schema(description = "commission id")
+    @Schema(description = "commission id (commission：来佣记录、入账记录、实际来佣记录、实际入账记录)")
    private Long id;
    /**
@@ -28,6 +28,7 @@ public class CommissionVO implements Serializable {
    /**
     * 入账检核年月 yyyy-MM
     */
+    @Schema(description = "入账检核年月 yyyy-MM")
    private String reconciliationYearMonth;
    /**
@@ -37,9 +38,9 @@ public class CommissionVO implements Serializable {
    private String policyNo;
    /**
-     * 保费
+     * 期交保费
     */
-    @Schema(description = "保费")
+    @Schema(description = "期交保费")
    private String premium;
    /**
@@ -49,6 +50,24 @@ public class CommissionVO implements Serializable {
    private String reconciliationCompany;
    /**
+     * 对账公司 id
+     */
+    @Schema(description = "对账公司 id")
+    private String reconciliationCompanyBizId;
+    /**
+     * 保险公司 id
+     */
+    @Schema(description = "保险公司 id")
+    private String insuranceCompanyBizId;
+    /**
+     * 产品计划 id
+     */
+    @Schema(description = "产品计划 id")
+    private String productLaunchBizId;
+    /**
     * 佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
     */
    @Schema(description = "佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)")
@@ -116,9 +135,9 @@ public class CommissionVO implements Serializable {
    private BigDecimal periodPendingRatio;
    /**
-     * 来佣状态
+     * 比对状态
     */
-    @Schema(description = "来佣状态 0=未比对 1=比对成功 2=比对失败 字典值: csf_commission_status")
+    @Schema(description = "比对状态 0=未比对 1=比对成功 2=比对失败 字典值: csf_commission_status")
    private String status;
    /**

--- a/yd-csf-service/src/main/resources/mappers/CommissionMapper.xml
+++ b/yd-csf-service/src/main/resources/mappers/CommissionMapper.xml
@@ -11,6 +11,8 @@
            <result property="reconciliationYearMonth" column="reconciliation_year_month" />
            <result property="policyNo" column="policy_no" />
            <result property="premium" column="premium" />
+            <result property="insuranceCompanyBizId" column="insurance_company_biz_id" />
+            <result property="productLaunchBizId" column="product_launch_biz_id" />
            <result property="reconciliationCompany" column="reconciliation_company" />
            <result property="reconciliationCompanyCode" column="reconciliation_company_code" />
            <result property="reconciliationCompanyBizId" column="reconciliation_company_biz_id" />
@@ -35,7 +37,9 @@
    </resultMap>
    <sql id="Base_Column_List">
-        id,receivable_no,commission_biz_id,reconciliation_year_month,policy_no,premium,reconciliation_company,reconciliation_company_code,reconciliation_company_biz_id,commission_period,
+        id,receivable_no,commission_biz_id,reconciliation_year_month,policy_no,premium,
+        insurance_company_biz_id,product_launch_biz_id,
+        reconciliation_company,reconciliation_company_code,reconciliation_company_biz_id,commission_period,
        total_period,commission_name,commission_type,exchange_rate,amount,currency,
        commission_date,current_commission_ratio,period_paid_ratio,period_pending_ratio,status,remark,is_deleted,creator_id,
        updater_id,create_time,update_time