新单跟进88

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

@@ -13,8 +13,10 @@ import com.yd.csf.api.dto.CommissionExcelDTO;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.model.Commission;
+import com.yd.csf.service.model.CommissionCompareRecord;
 import com.yd.csf.service.model.CommissionEditRecord;
 import com.yd.csf.service.model.CommissionExpected;
+import com.yd.csf.service.service.CommissionCompareRecordService;
 import com.yd.csf.service.service.CommissionEditRecordService;
 import com.yd.csf.service.service.CommissionExpectedService;
 import com.yd.csf.service.service.CommissionService;
@@ -61,6 +63,10 @@ public class ApiCommissionController {
     @Resource
     private CommissionEditRecordService commissionEditRecordService;
 
+    @Resource
+    private CommissionCompareRecordService commissionCompareRecordService;
+
+
 
     @PostMapping("/upload/excel")
     @Operation(summary = "上传保单来佣Excel文件")
@@ -188,7 +194,6 @@ public class ApiCommissionController {
         return Result.success(commissionService.generateFortune(generateFortuneRequest));
     }
 
-
     /**
      * 创建保单来佣
      *
@@ -206,6 +211,24 @@ public class ApiCommissionController {
     }
 
     /**
+     * 来佣比对记录列表
+     */
+    @PostMapping("/compare/records")
+    @Operation(summary = "来佣比对记录列表")
+    public Result<Page<CommissionCompareRecord>> getCommissionCompareRecords(@RequestBody CommissionCompareRecordQueryRequest queryRequest) {
+        if (StringUtils.isBlank(queryRequest.getCommissionBizId())) {
+            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "commissionBizId不能为空");
+        }
+        // 查询来佣比对记录
+        Page<CommissionCompareRecord> page = commissionCompareRecordService.page(new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()),
+                new LambdaQueryWrapper<CommissionCompareRecord>()
+                        .eq(CommissionCompareRecord::getCommissionBizId, queryRequest.getCommissionBizId())
+                        .orderByAsc(CommissionCompareRecord::getCommissionPeriod));
+
+        return Result.success(page);
+    }
+
+    /**
      * 删除来佣
      *
      * @param deleteRequest
@@ -258,18 +281,20 @@ public class ApiCommissionController {
     /**
      * 来佣操作记录列表
      *
-     * @param commissionBizId
+     * @param queryRequest
      * @return
      */
-    @GetMapping("/edit/records")
+    @PostMapping("/edit/records")
     @Operation(summary = "来佣操作记录列表")
-    public Result<List<CommissionEditRecord>> getCommissionEditRecords(@RequestParam("commissionBizId") String commissionBizId) {
-        if (StringUtils.isBlank(commissionBizId)) {
-            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
+    public Result<Page<CommissionEditRecord>> getCommissionEditRecords(@RequestBody CommissionEditRecordQueryRequest queryRequest) {
+        if (StringUtils.isBlank(queryRequest.getCommissionBizId())) {
+            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "commissionBizId不能为空");
         }
-        return Result.success(commissionEditRecordService.list(new LambdaQueryWrapper<CommissionEditRecord>()
-                .eq(CommissionEditRecord::getCommissionBizId, commissionBizId)
-                .orderByAsc(CommissionEditRecord::getSeq)));
+        // 查询来佣操作记录
+        Page<CommissionEditRecord> page = commissionEditRecordService.page(new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()), new LambdaQueryWrapper<CommissionEditRecord>()
+                .eq(CommissionEditRecord::getCommissionBizId, queryRequest.getCommissionBizId())
+                .orderByAsc(CommissionEditRecord::getSeq));
+        return Result.success(page);
     }
 
     /**

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

@@ -314,17 +314,19 @@ public class ApiFortuneController {
     /**
      * 修订记录
      *
-     * @param fortuneAccountBizId
+     * @param queryRequest
      * @return
      */
-    @GetMapping("/editRecords/fortuneAccount")
+    @PostMapping("/editRecords/fortuneAccount")
     @Operation(summary = "修订记录")
-    public Result<List<FortuneAccountEditRecord>> getFortuneAccountEditRecords(@RequestParam("fortuneAccountBizId") String fortuneAccountBizId) {
-        if (StringUtils.isBlank(fortuneAccountBizId)) {
+    public Result<Page<FortuneAccountEditRecord>> getFortuneAccountEditRecords(@RequestBody FortuneAccountEditRecordQueryRequest queryRequest) {
+        if (StringUtils.isBlank(queryRequest.getFortuneAccountBizId())) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "fortuneAccountBizId不能为空");
         }
-        return Result.success(fortuneAccountEditRecordService.list(new QueryWrapper<FortuneAccountEditRecord>()
-                .eq("fortune_account_biz_id", fortuneAccountBizId)));
+        Page<FortuneAccountEditRecord> page = fortuneAccountEditRecordService.page(new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()),
+                new QueryWrapper<FortuneAccountEditRecord>()
+                        .eq("fortune_account_biz_id", queryRequest.getFortuneAccountBizId()));
+        return Result.success(page);
     }
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/dao/CommissionCompareRecordMapper.java

+package com.yd.csf.service.dao;
+
+import com.yd.csf.service.model.CommissionCompareRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Zhang Jianan
+* @description 针对表【commission_compare_record(来佣比对记录表)】的数据库操作Mapper
+* @createDate 2025-11-25 13:43:10
+* @Entity generator.domain.CommissionCompareRecord
+*/
+public interface CommissionCompareRecordMapper extends BaseMapper<CommissionCompareRecord> {
+
+}
+
+
+
+

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

+package com.yd.csf.service.dto;
+
+import com.yd.common.dto.PageDto;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class CommissionCompareRecordQueryRequest extends PageDto {
+    /**
+     * 来佣业务ID
+     */
+    @Schema(description = "来佣业务ID")
+    private String commissionBizId;
+}

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

+package com.yd.csf.service.dto;
+
+import com.yd.common.dto.PageDto;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class CommissionEditRecordQueryRequest extends PageDto {
+    /**
+     * 来佣业务ID
+     */
+    @Schema(description = "来佣业务ID")
+    private String commissionBizId;
+}

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

+package com.yd.csf.service.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 编辑预计来佣请求
+ *
+ */
+@Data
+public class CommissionExpectedEditRequest implements Serializable {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 标签列表
+     */
+    private List<String> tags;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

+package com.yd.csf.service.dto;
+
+import com.yd.common.dto.PageDto;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class FortuneAccountEditRecordQueryRequest extends PageDto {
+    /**
+     * 薪资记录业务ID
+     */
+    @Schema(description = "薪资记录业务ID")
+    private String fortuneAccountBizId;
+}

yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionCompareRecord.java

+package com.yd.csf.service.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 来佣比对记录表
+ * @TableName commission_compare_record
+ */
+@TableName(value ="commission_compare_record")
+@Data
+public class CommissionCompareRecord implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 预计来佣业务id
+     */
+    @Schema(description = "预计来佣业务id")
+    private String commissionExpectedBizId;
+
+    /**
+     * 保单来佣业务id
+     */
+    @Schema(description = "保单来佣业务id")
+    private String commissionBizId;
+
+    /**
+     * 佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
+     */
+    @Schema(description = "佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)")
+    private Integer commissionPeriod;
+
+    /**
+     * 总期数
+     */
+    @Schema(description = "总期数")
+    private Integer totalPeriod;
+
+    /**
+     * 比对状态 1=比对成功 2=比对失败
+     */
+    @Schema(description = "比对状态 1=比对成功 2=比对失败")
+    private String status;
+
+    /**
+     * 来佣币种
+     */
+    @Schema(description = "来佣币种")
+    private String currency;
+
+    /**
+     * 比对时间
+     */
+    @Schema(description = "比对时间")
+    private Date createTime;
+
+    /**
+     * 结算汇率
+     */
+    @Schema(description = "结算汇率")
+    private String exchangeRate;
+
+    /**
+     * 入账金额
+     */
+    @Schema(description = "入账金额")
+    private BigDecimal amount;
+
+    /**
+     * 通用备注
+     */
+    @JsonIgnore
+    private String remark;
+
+    /**
+     * 删除标识: 0-正常, 1-删除
+     */
+    @JsonIgnore
+    private Integer isDeleted;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionCompareRecordService.java

+package com.yd.csf.service.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.csf.service.model.CommissionCompareRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author Zhang Jianan
+* @description 针对表【commission_compare_record(来佣比对记录表)】的数据库操作Service
+* @createDate 2025-11-25 13:43:10
+*/
+public interface CommissionCompareRecordService extends IService<CommissionCompareRecord> {
+
+}

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

+package com.yd.csf.service.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yd.csf.service.model.CommissionCompareRecord;
+import com.yd.csf.service.service.CommissionCompareRecordService;
+import com.yd.csf.service.dao.CommissionCompareRecordMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Zhang Jianan
+* @description 针对表【commission_compare_record(来佣比对记录表)】的数据库操作Service实现
+* @createDate 2025-11-25 13:43:10
+*/
+@Service
+public class CommissionCompareRecordServiceImpl extends ServiceImpl<CommissionCompareRecordMapper, CommissionCompareRecord>
+    implements CommissionCompareRecordService{
+
+}
+
+
+
+

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

@@ -391,9 +391,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
                 expected.setStatus(CommissionExpectedStatusEnum.PARTIAL.getItemValue());
             }
+        } else {
+            // 保存比对记录
+            saveCompareRecord(commission, expected);
         }
     }
 
+    private void saveCompareRecord(Commission commission, CommissionExpected expected) {
+        
+    }
+
     /**
      * 查询列表
      *

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionVO.java

@@ -87,6 +87,30 @@ public class CommissionVO implements Serializable {
     private String status;
 
     /**
+     * 预计来佣业务id
+     */
+    @Schema(description = "预计来佣业务id")
+    private String commissionExpectedBizId;
+
+    /**
+     * 总金额
+     */
+    @Schema(description = "总金额")
+    private String expectedAmount;
+
+    /**
+     * 已入账金额
+     */
+    @Schema(description = "已入账金额")
+    private String paidAmount;
+
+    /**
+     * 待入账金额
+     */
+    @Schema(description = "待入账金额")
+    private String pendingAmount;
+
+    /**
      * 通用备注
      */
     @Schema(description = "备注")

yd-csf-service/src/main/resources/mappers/CommissionCompareRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yd.csf.service.dao.CommissionCompareRecordMapper">
+
+    <resultMap id="BaseResultMap" type="com.yd.csf.service.model.CommissionCompareRecord">
+            <id property="id" column="id" />
+            <result property="commissionExpectedBizId" column="commission_expected_biz_id" />
+            <result property="commissionBizId" column="commission_biz_id" />
+            <result property="commissionPeriod" column="commission_period" />
+            <result property="totalPeriod" column="total_period" />
+            <result property="status" column="status" />
+            <result property="currency" column="currency" />
+            <result property="createTime" column="create_time" />
+            <result property="exchangeRate" column="exchange_rate" />
+            <result property="amount" column="amount" />
+            <result property="remark" column="remark" />
+            <result property="isDeleted" column="is_deleted" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,commission_expected_biz_id,commission_biz_id,commission_period,total_period,status,
+        currency,create_time,exchange_rate,amount,remark,
+        is_deleted
+    </sql>
+</mapper>