Skip to content

Y
yd-csf
Commit 54f66a1d by jianan
Options

前端对接问题修复2

parent f1f1092d
Showing with 191 additions and 87 deletions
yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ExpectedFortuneAddRequest.java
package com.yd.csf.feign.request.expectedfortune; package com.yd.csf.feign.request.expectedfortune;
import com.yd.csf.feign.response.expectedfortune.PolicyInfo; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@Data @Data
public class ExpectedFortuneAddRequest { public class ExpectedFortuneAddRequest {
...@@ -18,27 +16,27 @@ public class ExpectedFortuneAddRequest { ...@@ -18,27 +16,27 @@ public class ExpectedFortuneAddRequest {
private String fortuneBizType; private String fortuneBizType;
/** /**
* 保单号 * 关联保单号
*/ */
@Schema(description = "policy no") @Schema(description = "关联保单号")
private String policyNo; private String policyNo;
/** /**
* 产品上架信息业务ID * 产品计划 ID
*/ */
@Schema(description = "产品计划: 产品上架信息业务ID") @Schema(description = "产品计划 ID")
private String productLaunchBizId; private String productLaunchBizId;
/** /**
* 发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年) * 佣金期数
*/ */
@Schema(description = "fortune period") @Schema(description = "佣金期数")
private Integer fortunePeriod; private Integer fortunePeriod;
/** /**
* 发佣总期数 * 总期数
*/ */
@Schema(description = "fortune total period") @Schema(description = "总期数")
private Integer fortuneTotalPeriod; private Integer fortuneTotalPeriod;
/** /**
...@@ -66,33 +64,47 @@ public class ExpectedFortuneAddRequest { ...@@ -66,33 +64,47 @@ public class ExpectedFortuneAddRequest {
private String teamBizId; private String teamBizId;
/** /**
* 发佣名称 * 出账项目
*/ */
@Schema(description = "发佣名称") @Schema(description = "出账项目")
private String fortuneName; private String fortuneName;
/** /**
* 发佣类型 * 出账项目类型
*/ */
@Schema(description = "发佣类型") @Schema(description = "出账项目类型")
private String fortuneType; private String fortuneType;
/** /**
* 预计应发金额 * 出账金额
*/ */
@Schema(description = "预计应发金额") @Schema(description = "出账金额")
private BigDecimal amount; private BigDecimal amount;
/** /**
* 发佣币种 * 出账币种
*/ */
@Schema(description = "发佣币种") @Schema(description = "出账币种")
private String currency; private String currency;
/** /**
* 预计发佣日期 * 出账日 (估)
*/ */
@Schema(description = "预计发佣日期") @Schema(description = "出账日 (估)")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate payoutDate; private LocalDate payoutDate;
/**
* 出账日 (实)
*/
@Schema(description = "出账日 (实)")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate actualPayoutDate;
/**
* 出账状态
*/
@Schema(description = "出账状态 0=待出账 1=可出帐，待检核 2=完成出账 3=部分出账 4=保留 5=已失效 6=可出帐，检核完成 7=未找到当前预计发佣对应的来佣, 字典值: csf_expected_fortune_status")
private String status;
} }
yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ExpectedFortuneUpdateRequest.java
...@@ -16,7 +16,7 @@ public class ExpectedFortuneUpdateRequest { ...@@ -16,7 +16,7 @@ public class ExpectedFortuneUpdateRequest {
/** /**
* 出账状态 * 出账状态
*/ */
@Schema(description = "出账状态 0=待出账 1=可出帐 2=完成出账 3=部分出账 4=保留 5=已失效, 字典值: csf_fortune_status") @Schema(description = "出账状态 0=待出账 1=可出帐，待检核 2=完成出账 3=部分出账 4=保留 5=已失效 6=可出帐，检核完成 7=未找到当前预计发佣对应的来佣, 字典值: csf_expected_fortune_status")
private String status; private String status;
/** /**
......
yd-csf-feign/src/main/java/com/yd/csf/feign/response/expectedfortune/ApiExpectedFortunePageResponse.java
package com.yd.csf.feign.response.expectedfortune; package com.yd.csf.feign.response.expectedfortune;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -28,15 +30,33 @@ public class ApiExpectedFortunePageResponse { ...@@ -28,15 +30,33 @@ public class ApiExpectedFortunePageResponse {
private String fortuneBizType; private String fortuneBizType;
/** /**
* 应付款编号
*/
@Schema(description = "应付款编号")
private String payableNo;
/**
* 保单号 * 保单号
*/ */
@Schema(description = "policy no") @Schema(description = "policy no")
private String policyNo; private String policyNo;
/** /**
* 产品上架信息业务ID * 期交保费
*/
@Schema(description = "期交保费")
private BigDecimal premium;
/**
* 保险公司 ID
*/
@Schema(description = "保险公司 ID")
private String insuranceCompanyBizId;
/**
* 产品计划 ID
*/ */
@Schema(description = "产品上架信息业务ID") @Schema(description = "产品计划 ID")
private String productLaunchBizId; private String productLaunchBizId;
/** /**
...@@ -46,13 +66,13 @@ public class ApiExpectedFortunePageResponse { ...@@ -46,13 +66,13 @@ public class ApiExpectedFortunePageResponse {
private PolicyInfo policy; private PolicyInfo policy;
/** /**
* 发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年) * 出账期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
*/ */
@Schema(description = "fortune period") @Schema(description = "fortune period")
private Integer fortunePeriod; private Integer fortunePeriod;
/** /**
* 发佣总期数 * 总期数
*/ */
@Schema(description = "fortune total period") @Schema(description = "fortune total period")
private Integer fortuneTotalPeriod; private Integer fortuneTotalPeriod;
...@@ -82,42 +102,50 @@ public class ApiExpectedFortunePageResponse { ...@@ -82,42 +102,50 @@ public class ApiExpectedFortunePageResponse {
private String teamBizId; private String teamBizId;
/** /**
* 发佣名称 * 出账项目
*/ */
@Schema(description = "发佣名称") @Schema(description = "出账项目")
private String fortuneName; private String fortuneName;
/** /**
* 发佣类型 * 出账项目类型
*/ */
@Schema(description = "发佣类型") @Schema(description = "出账项目类型")
private String fortuneType; private String fortuneType;
/** /**
* 预计应发金额 * 应出账金额
*/ */
@Schema(description = "预计应发金额") @Schema(description = "应出账金额")
private BigDecimal amount; private BigDecimal amount;
/** /**
* 发佣币种 * 出账币种
*/ */
@Schema(description = "发佣币种") @Schema(description = "出账币种")
private String currency; private String currency;
/** /**
* 发佣状态 0=待出账 1=可出帐 2=完成出账 3=部分出账 4=保留 5=已失效 * 出账状态
*/ */
@Schema(description = "发佣状态 0=待出账 1=可出帐 2=完成出账 3=部分出账 4=保留 5=已失效") @Schema(description = "出账状态 0=待出账 1=可出帐，待检核 2=完成出账 3=部分出账 4=保留 5=已失效 6=可出账, 已检核 7=未找到当前预计发佣对应的来佣 字典值: csf_expected_fortune_status")
private String status; private String status;
/** /**
* 预计发佣日期 * 预计出账日期
*/ */
@Schema(description = "预计发佣日期") @Schema(description = "预计出账日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate payoutDate; private LocalDate payoutDate;
/** /**
* 实际出账日期
*/
@Schema(description = "实际出账日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate actualPayoutDate;
/**
* 已出账金额 * 已出账金额
*/ */
@Schema(description = "已出账金额") @Schema(description = "已出账金额")
...@@ -130,12 +158,18 @@ public class ApiExpectedFortunePageResponse { ...@@ -130,12 +158,18 @@ public class ApiExpectedFortunePageResponse {
private BigDecimal unpaidAmount; private BigDecimal unpaidAmount;
/** /**
* 发佣比例 已发佣金额/应发佣金额 * 已出账比例 已出账金额/应出账金额
*/ */
@Schema(description = "发佣比例 已发佣金额/应发佣金额") @Schema(description = "已出账比例 已出账金额/应出账金额")
private BigDecimal paidRatio; private BigDecimal paidRatio;
/** /**
* 待出账比例 待出账金额/应出账金额
*/
@Schema(description = "待出账比例 待出账金额/应出账金额")
private BigDecimal unpaidRatio;
/**
* 基本法项目配置表唯一业务ID * 基本法项目配置表唯一业务ID
*/ */
@Schema(description = "rule item biz id") @Schema(description = "rule item biz id")
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedAddDto.java
package com.yd.csf.service.dto; package com.yd.csf.service.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDate;
@Data @Data
public class CommissionExpectedAddDto { public class CommissionExpectedAddDto {
...@@ -27,9 +28,9 @@ public class CommissionExpectedAddDto { ...@@ -27,9 +28,9 @@ public class CommissionExpectedAddDto {
private String commissionBizType; private String commissionBizType;
/** /**
* 保单号 * 关联保单号
*/ */
@Schema(description = "保单号") @Schema(description = "关联保单号")
private String policyNo; private String policyNo;
/** /**
...@@ -51,52 +52,66 @@ public class CommissionExpectedAddDto { ...@@ -51,52 +52,66 @@ public class CommissionExpectedAddDto {
private String reconciliationCompanyBizId; private String reconciliationCompanyBizId;
/** /**
* 佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年) * 佣金期数
*/ */
@Schema(description = "佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)") @Schema(description = "佣金期数")
private Integer commissionPeriod; private Integer commissionPeriod;
/** /**
* 总来佣期数 * 总期数
*/ */
@Schema(description = "总来佣期数") @Schema(description = "总期数")
private Integer totalPeriod; private Integer totalPeriod;
/** /**
* 来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等) * 入账项目(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
*/ */
@Schema(description = "来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)") @Schema(description = "入账项目(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)")
private String commissionName; private String commissionName;
/** /**
* 来佣类型(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等) * 入账项目类型(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
*/ */
@Schema(description = "来佣类型(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)") @Schema(description = "入账项目类型(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)")
private String commissionType; private String commissionType;
/** /**
* 来佣比例 (%) * 入账比例 (%)
*/ */
@Schema(description = "来佣比例 (%)") @Schema(description = "入账比例 (%)")
private BigDecimal commissionRatio; private BigDecimal commissionRatio;
/** /**
* 来佣币种 * 入账币种
*/ */
@Schema(description = "来佣币种") @Schema(description = "入账币种")
private String currency; private String currency;
/** /**
* 来佣金额 * 入账金额
*/ */
@Schema(description = "来佣金额") @Schema(description = "入账金额")
private BigDecimal amount; private BigDecimal amount;
/** /**
* 来佣日期 * 入账日 (估)
*/ */
@Schema(description = "来佣日期 format:yyyy-MM-dd") @Schema(description = "入账日 (估) format:yyyy-MM-dd")
private Date commissionDate; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate commissionDate;
/**
* 入账日 (实)
*/
@Schema(description = "入账日 (实) format:yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate actualCommissionDate;
/**
* 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效
*/
@Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_commission_expected_status")
private String status;
/** /**
* 备注 * 备注
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedQueryRequest.java
...@@ -19,20 +19,20 @@ public class CommissionExpectedQueryRequest extends PageDto { ...@@ -19,20 +19,20 @@ public class CommissionExpectedQueryRequest extends PageDto {
/** /**
* 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选 * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选
*/ */
@Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选") @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选，字典值: csf_commission_expected_status")
private List<String> statusList; private List<String> statusList;
/** /**
* 预计来佣日期开始 格式：yyyy-MM-dd * 预计入账日期开始 格式：yyyy-MM-dd
*/ */
@Schema(description = "预计来佣日期开始 格式：yyyy-MM-dd") @Schema(description = "预计入账日期开始 格式：yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date commissionDateStart; private Date commissionDateStart;
/** /**
* 预计来佣日期结束 格式：yyyy-MM-dd * 预计入账日期结束 格式：yyyy-MM-dd
*/ */
@Schema(description = "预计来佣日期结束 格式：yyyy-MM-dd") @Schema(description = "预计入账日期结束 格式：yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date commissionDateEnd; private Date commissionDateEnd;
...@@ -43,22 +43,22 @@ public class CommissionExpectedQueryRequest extends PageDto { ...@@ -43,22 +43,22 @@ public class CommissionExpectedQueryRequest extends PageDto {
private Integer commissionPeriod; private Integer commissionPeriod;
/** /**
* 来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等) * 入账项目(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
*/ */
@Schema(description = "来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)") @Schema(description = "入账项目(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)")
private String commissionName; private String commissionName;
/** /**
* 对账公司 * 对账公司业务ID列表
*/ */
@Schema(description = "对账公司") @Schema(description = "对账公司业务ID列表")
private String reconciliationCompany; private List<String> reconciliationCompanyBizIdList;
/** /**
* 保险公司业务ID * 保险公司业务ID列表
*/ */
@Schema(description = "保险公司业务ID") @Schema(description = "保险公司业务ID列表")
private String insurerBizId; private List<String> insurerCompanyBizIdList;
/** /**
* 产品上架信息表唯一业务ID * 产品上架信息表唯一业务ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionExpected.java
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
...@@ -14,9 +15,10 @@ import org.springframework.beans.BeanUtils; ...@@ -14,9 +15,10 @@ import org.springframework.beans.BeanUtils;
/** /**
* 预计来佣表 * 预计来佣表
*
* @TableName commission_expected * @TableName commission_expected
*/ */
@TableName(value ="commission_expected") @TableName(value = "commission_expected")
@Data @Data
public class CommissionExpected implements Serializable { public class CommissionExpected implements Serializable {
/** /**
...@@ -46,6 +48,16 @@ public class CommissionExpected implements Serializable { ...@@ -46,6 +48,16 @@ public class CommissionExpected implements Serializable {
private String policyNo; private String policyNo;
/** /**
* 保险公司业务id
*/
private String insuranceCompanyBizId;
/**
* 产品计划 id
*/
private String productLaunchBizId;
/**
* 对账公司 * 对账公司
*/ */
private String reconciliationCompany; private String reconciliationCompany;
...@@ -71,12 +83,12 @@ public class CommissionExpected implements Serializable { ...@@ -71,12 +83,12 @@ public class CommissionExpected implements Serializable {
private Integer totalPeriod; private Integer totalPeriod;
/** /**
* 来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等) * 入账项目(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
*/ */
private String commissionName; private String commissionName;
/** /**
* 来佣类型(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等) * 入账项目类型(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
*/ */
private String commissionType; private String commissionType;
...@@ -86,22 +98,27 @@ public class CommissionExpected implements Serializable { ...@@ -86,22 +98,27 @@ public class CommissionExpected implements Serializable {
private BigDecimal commissionRatio; private BigDecimal commissionRatio;
/** /**
* 来佣金额 * 入账金额
*/ */
private BigDecimal amount; private BigDecimal amount;
/** /**
* 来佣币种 * 入账币种
*/ */
private String currency; private String currency;
/** /**
* 来佣日期 * 来佣日期 (估)
*/ */
private Date commissionDate; private Date commissionDate;
/** /**
* 来佣状态 0=待入账 1=完成入账 2=部分入账 3=已失效 * 入账日 (实)
*/
private Date actualCommissionDate;
/**
* 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_commission_expected_status
*/ */
private String status; private String status;
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortune.java
...@@ -59,6 +59,18 @@ public class ExpectedFortune implements Serializable { ...@@ -59,6 +59,18 @@ public class ExpectedFortune implements Serializable {
private String policyNo; private String policyNo;
/** /**
* 期交保费
*/
@TableField("premium")
private BigDecimal premium;
/**
* 保险公司 ID
*/
@TableField("insurance_company_biz_id")
private String insuranceCompanyBizId;
/**
* 产品上架信息业务ID * 产品上架信息业务ID
*/ */
@TableField("product_launch_biz_id") @TableField("product_launch_biz_id")
...@@ -137,7 +149,7 @@ public class ExpectedFortune implements Serializable { ...@@ -137,7 +149,7 @@ public class ExpectedFortune implements Serializable {
private String currency; private String currency;
/** /**
* 佣金发放状态 0=待出账 1=可出帐 2=已出账 3=部分出账 4=保留 5=已失效 * 出账状态 0=待出账 1=可出帐 2=可出帐，待检核 3=部分出账 4=保留 5=已失效 6=可出账, 已检核 7=未找到当前预计发佣对应的来佣 字典值: csf_expected_fortune_status
*/ */
@TableField("status") @TableField("status")
private String status; private String status;
...@@ -149,12 +161,18 @@ public class ExpectedFortune implements Serializable { ...@@ -149,12 +161,18 @@ public class ExpectedFortune implements Serializable {
// private BigDecimal currentPaymentAmount; // private BigDecimal currentPaymentAmount;
/** /**
* 预计发佣日期 * 预计出账日期
*/ */
@TableField("payout_date") @TableField("payout_date")
private LocalDate payoutDate; private LocalDate payoutDate;
/** /**
* 实际出账日期
*/
@TableField("actual_payout_date")
private LocalDate actualPayoutDate;
/**
* 已出账金额 * 已出账金额
*/ */
@TableField("paid_amount") @TableField("paid_amount")
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
...@@ -149,7 +149,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -149,7 +149,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
} }
// 获取查询参数 // 获取查询参数
String policyNo = commissionExpectedQueryRequest.getPolicyNo(); String policyNo = commissionExpectedQueryRequest.getPolicyNo();
String insurerBizId = commissionExpectedQueryRequest.getInsurerBizId(); List<String> insurerCompanyBizIdList = commissionExpectedQueryRequest.getInsurerCompanyBizIdList();
List<String> reconciliationCompanyBizIdList = commissionExpectedQueryRequest.getReconciliationCompanyBizIdList();
List<String> statusList = commissionExpectedQueryRequest.getStatusList(); List<String> statusList = commissionExpectedQueryRequest.getStatusList();
Date commissionDateStart = commissionExpectedQueryRequest.getCommissionDateStart(); Date commissionDateStart = commissionExpectedQueryRequest.getCommissionDateStart();
Date commissionDateEnd = commissionExpectedQueryRequest.getCommissionDateEnd(); Date commissionDateEnd = commissionExpectedQueryRequest.getCommissionDateEnd();
...@@ -159,7 +160,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -159,7 +160,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
String teamBizId = commissionExpectedQueryRequest.getTeamBizId(); String teamBizId = commissionExpectedQueryRequest.getTeamBizId();
// 精确查询 // 精确查询
queryWrapper.eq(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo); queryWrapper.eq(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
queryWrapper.eq(ObjectUtils.isNotEmpty(insurerBizId), "insurer_biz_id", insurerBizId); queryWrapper.in(ObjectUtils.isNotEmpty(insurerCompanyBizIdList), "insurance_company_biz_id", insurerCompanyBizIdList);
queryWrapper.in(ObjectUtils.isNotEmpty(reconciliationCompanyBizIdList), "reconciliation_company_biz_id", reconciliationCompanyBizIdList);
queryWrapper.eq(ObjectUtils.isNotEmpty(commissionPeriod), "commission_period", commissionPeriod); queryWrapper.eq(ObjectUtils.isNotEmpty(commissionPeriod), "commission_period", commissionPeriod);
queryWrapper.eq(ObjectUtils.isNotEmpty(productLaunchBizId), "product_launch_biz_id", productLaunchBizId); queryWrapper.eq(ObjectUtils.isNotEmpty(productLaunchBizId), "product_launch_biz_id", productLaunchBizId);
queryWrapper.eq(ObjectUtils.isNotEmpty(commissionBizType), "commission_biz_type", commissionBizType); queryWrapper.eq(ObjectUtils.isNotEmpty(commissionBizType), "commission_biz_type", commissionBizType);
......
yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedVO.java
...@@ -122,7 +122,7 @@ public class CommissionExpectedVO implements Serializable { ...@@ -122,7 +122,7 @@ public class CommissionExpectedVO implements Serializable {
/** /**
* 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效
*/ */
@Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效") @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_commission_expected_status")
private String status; private String status;
/** /**
......
yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<result property="receivableNo" column="receivable_no" /> <result property="receivableNo" column="receivable_no" />
<result property="commissionBizType" column="commission_biz_type" /> <result property="commissionBizType" column="commission_biz_type" />
<result property="policyNo" column="policy_no" /> <result property="policyNo" column="policy_no" />
<result property="insuranceCompanyBizId" column="insurance_company_biz_id" />
<result property="productLaunchBizId" column="product_launch_biz_id" />
<result property="reconciliationCompany" column="reconciliation_company" /> <result property="reconciliationCompany" column="reconciliation_company" />
<result property="reconciliationCompanyCode" column="reconciliation_company_code" /> <result property="reconciliationCompanyCode" column="reconciliation_company_code" />
<result property="reconciliationCompanyBizId" column="reconciliation_company_biz_id" /> <result property="reconciliationCompanyBizId" column="reconciliation_company_biz_id" />
...@@ -21,10 +23,12 @@ ...@@ -21,10 +23,12 @@
<result property="amount" column="amount" /> <result property="amount" column="amount" />
<result property="currency" column="currency" /> <result property="currency" column="currency" />
<result property="commissionDate" column="commission_date" /> <result property="commissionDate" column="commission_date" />
<result property="actualCommissionDate" column="actual_commission_date" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="defaultExchangeRate" column="default_exchange_rate" /> <result property="defaultExchangeRate" column="default_exchange_rate" />
<result property="expectedAmount" column="expected_amount" /> <result property="expectedAmount" column="expected_amount" />
<result property="paidAmount" column="paid_amount" /> <result property="paidAmount" column="paid_amount" />
<result property="paidRatio" column="paid_ratio" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="isDeleted" column="is_deleted" /> <result property="isDeleted" column="is_deleted" />
<result property="creatorId" column="creator_id" /> <result property="creatorId" column="creator_id" />
...@@ -34,9 +38,11 @@ ...@@ -34,9 +38,11 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id,commission_expected_biz_id,receivable_no,commission_biz_type,policy_no,reconciliation_company,reconciliation_company_code,reconciliation_company_biz_id,commission_period, id,commission_expected_biz_id,receivable_no,commission_biz_type,
policy_no,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,commission_ratio,amount,currency,default_exchange_rate,expected_amount, total_period,commission_name,commission_type,commission_ratio,amount,currency,default_exchange_rate,expected_amount,
commission_date,status,paid_amount,remark,is_deleted,creator_id, commission_date,status,paid_amount,paid_ratio,remark,is_deleted,creator_id,
updater_id,create_time,update_time updater_id,create_time,update_time
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment