Commit 560f3205 by jianan

入账检核-计算达成率缺口

parent 27a7688a
...@@ -169,7 +169,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -169,7 +169,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
if (commissionExpected.getCommissionRatio() != null) { if (commissionExpected.getCommissionRatio() != null) {
BigDecimal paidRatio = commissionExpected.getPaidRatio() != null ? commissionExpected.getPaidRatio() : BigDecimal.ZERO; BigDecimal paidRatio = commissionExpected.getPaidRatio() != null ? commissionExpected.getPaidRatio() : BigDecimal.ZERO;
commissionVO.setPaidRatio(paidRatio); commissionVO.setPaidRatio(paidRatio);
commissionVO.setPendingRatio(commissionExpected.getCommissionRatio().subtract(paidRatio)); commissionVO.setPendingRatio(BigDecimal.ONE.subtract(paidRatio.divide(commissionExpected.getCommissionRatio(), 4, RoundingMode.HALF_UP)));
} }
commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus()); commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus());
} }
......
...@@ -154,9 +154,9 @@ public class CommissionVO implements Serializable { ...@@ -154,9 +154,9 @@ public class CommissionVO implements Serializable {
private Date commissionDate; private Date commissionDate;
/** /**
* 当前来佣比例 * 当前来佣比例 (实佣率=实际入账金额/结算汇率/每期保费)
*/ */
@Schema(description = "当前来佣比例") @Schema(description = "当前来佣比例 (实佣率=实际入账金额/结算汇率/每期保费)")
private BigDecimal currentCommissionRatio; private BigDecimal currentCommissionRatio;
/** /**
...@@ -196,9 +196,9 @@ public class CommissionVO implements Serializable { ...@@ -196,9 +196,9 @@ public class CommissionVO implements Serializable {
private BigDecimal paidRatio; private BigDecimal paidRatio;
/** /**
* 待入账比例 * 达成率缺口= 1 - 本期实佣率/产品本期来佣率
*/ */
@Schema(description = "待入账比例") @Schema(description = "达成率缺口= 1 - 累积实佣率/产品本期来佣率")
private BigDecimal pendingRatio; private BigDecimal pendingRatio;
/** /**
......
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