Skip to content

Y
yd-csf
Commit 9d7dbf3f by zhangxingmin
Options

push

parent e30262ac
Showing with 39 additions and 32 deletions
yd-csf-api/src/main/java/com/yd/csf/api/dto/QueryCommissionExpectedByPageNewResponse.java
......@@ -11,8 +11,15 @@ import lombok.Data;
@Data
@Schema(description = "查询预计来佣分页响应")
public class QueryCommissionExpectedByPageNewResponse {
@Schema(description = "预计来佣统计信息")
/**
* 预计来佣统计信息
*/
// @Schema(description = "预计来佣统计信息")
private CommissionExpectedStatisticsNewVO expectedStatisticsVO;
@Schema(description = "预计来佣分页列表")
/**
* 预计来佣分页列表
*/
// @Schema(description = "预计来佣分页列表")
private Page<CommissionExpectedNewVO> page;
}
yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedNewVO.java
......@@ -32,74 +32,74 @@ public class CommissionExpectedNewVO implements Serializable {
/**
* 应收款类型 R=关联保单应收单 U=非关联保单应收单
*/
@Schema(description = "应收款类型 R=关联保单应收单 U=非关联保单应收单")
// @Schema(description = "应收款类型 R=关联保单应收单 U=非关联保单应收单")
private String commissionBizType;
/**
* 预计来佣-保单号
*/
@Schema(description = "保单号")
// @Schema(description = "保单号")
private String policyNo;
/**
* 预计来佣-对账公司
*/
@Schema(description = "对账公司")
// @Schema(description = "对账公司")
private String reconciliationCompany;
/**
* 预计来佣-对账公司业务ID
*/
@Schema(description = "对账公司业务ID")
// @Schema(description = "对账公司业务ID")
private String reconciliationCompanyBizId;
/**
* 预计来佣-入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效
*/
@Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_expected_commission_status")
// @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 字典值: csf_expected_commission_status")
private String status;
/**
* 预计来佣-佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
*/
@Schema(description = "佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)")
// @Schema(description = "佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)")
private Integer commissionPeriod;
/**
* 预计来佣-总来佣期数
*/
@Schema(description = "总来佣期数")
// @Schema(description = "总来佣期数")
private Integer totalPeriod;
/**
* 预计来佣-来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
*/
@Schema(description = "来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)")
// @Schema(description = "来佣名称(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)")
private String commissionName;
/**
* 预计来佣-入账年月（估） * （预计来佣日期）
*/
@Schema(description = "入账年月（估）")
// @Schema(description = "入账年月（估）")
@JsonFormat(pattern = "yyyyMM", timezone = "GMT+8")
private Date commissionDateMonth;
/**
* 入账检核记录-入账检核年月 yyyyMM（入账年月（实））
*/
@Schema(description = "入账检核年月 yyyyMM")
// @Schema(description = "入账检核年月 yyyyMM")
private String realReconciliationYearMonth;
/**
* 预计来佣-已入账来佣比例 (%) （ 累积已入账比例）
*/
@Schema(description = "已入账来佣比例 (%)")
// @Schema(description = "已入账来佣比例 (%)")
private BigDecimal paidRatio;
/**
* 预计来佣-预计入账比例 (%)（产品对应来佣率）
*/
@Schema(description = "预计入账比例 (%)")
// @Schema(description = "预计入账比例 (%)")
private BigDecimal commissionRatio;
/**
......@@ -107,19 +107,19 @@ public class CommissionExpectedNewVO implements Serializable {
* 如果这里是否实收是预计：realRate统计当前预计下面的实际来拥记录的实佣率累加和
* 如果这里是否实收是实收：realRate取realCurrentCommissionRatio赋值
*/
@Schema(description = "实佣率")
// @Schema(description = "实佣率")
private BigDecimal realRate;
/**
* 达成率缺口（1-实佣率/产品对应来佣率）*
*/
@Schema(description = "实佣率")
// @Schema(description = "实佣率")
private BigDecimal gapRate;
/**
* 入账检核记录-当前结算汇率（结算汇率（实））
*/
@Schema(description = "当前结算汇率")
// @Schema(description = "当前结算汇率")
private BigDecimal realExchangeRate;
/**
......@@ -135,49 +135,49 @@ public class CommissionExpectedNewVO implements Serializable {
/**
* 预计来佣-待入账金额
*/
@Schema(description = "待入账金额")
// @Schema(description = "待入账金额")
private BigDecimal pendingAmount;
/**
* 预计来佣-预计入账金额（HKD）
*/
@Schema(description = "预计入账金额（HKD）")
// @Schema(description = "预计入账金额（HKD）")
private BigDecimal expectedAmount;
/**
* 预计来佣-结算汇率（估）
*/
@Schema(description = "结算汇率（估）")
// @Schema(description = "结算汇率（估）")
private BigDecimal defaultExchangeRate;
/**
* 预计来佣-保险公司
*/
@Schema(description = "保险公司")
// @Schema(description = "保险公司")
private String insuranceCompany;
/**
* 预计来佣-产品计划名称
*/
@Schema(description = "产品计划名称")
// @Schema(description = "产品计划名称")
private String productName;
/**
* 预计来佣-保单币种
*/
@Schema(description = "保单币种")
// @Schema(description = "保单币种")
private String policyCurrency;
/**
* 预计来佣-期交保费
*/
@Schema(description = "期交保费")
// @Schema(description = "期交保费")
private Object premium;
/**
* 入账检核记录-通用备注
*/
@Schema(description = "备注")
// @Schema(description = "备注")
private String realRemark;
/**
......@@ -188,7 +188,7 @@ public class CommissionExpectedNewVO implements Serializable {
/**
* 入账检核记录-更新时间
*/
@Schema(description = "更新时间")
// @Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date realUpdateTime;
......
yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedStatisticsNewVO.java
......@@ -14,37 +14,37 @@ public class CommissionExpectedStatisticsNewVO {
/**
* 预计入账金额（HKD）
*/
@Schema(description = "预计入账金额（HKD）")
// @Schema(description = "预计入账金额（HKD）")
private BigDecimal totalAmount;
/**
* 已入账金额（HKD）
*/
@Schema(description = "已入账金额（HKD）")
// @Schema(description = "已入账金额（HKD）")
private BigDecimal totalPaidAmount;
/**
* 待入账金额（HKD）
*/
@Schema(description = "待入账金额（HKD）")
// @Schema(description = "待入账金额（HKD）")
private BigDecimal pendingPaidAmount;
/**
* 已入账比例 %（已入账金额/总金额）
*/
@Schema(description = "已入账比例 %（已入账金额/总金额）")
// @Schema(description = "已入账比例 %（已入账金额/总金额）")
private BigDecimal paidAmountRatio;
/**
* 总保单数
*/
@Schema(description = "总保单数")
// @Schema(description = "总保单数")
private Integer totalPolicyCount;
/**
* 总保费（HKD）
*/
@Schema(description = "总保费（HKD）")
// @Schema(description = "总保费（HKD）")
private BigDecimal totalPremium;
@JsonIgnore
......
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