push

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

@@ -244,7 +244,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         vo.setCommissionDateMonth(expected.getCommissionDate());
         vo.setCommissionDateMonth(expected.getCommissionDate());
         vo.setType(1);
         vo.setType(1);
         vo.setNo(StringUtils.isNotBlank(expected.getReceivableNo()) ? expected.getReceivableNo() : expected.getCommissionExpectedBizId());
         vo.setNo(StringUtils.isNotBlank(expected.getReceivableNo()) ? expected.getReceivableNo() : expected.getCommissionExpectedBizId());
-
+        vo.setCommissionDate(null);
         // 填充保单信息
         // 填充保单信息
         Policy policy = policyMap.get(expected.getPolicyNo());
         Policy policy = policyMap.get(expected.getPolicyNo());
         if (policy != null) {
         if (policy != null) {
@@ -287,7 +287,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
 
 
         //计算累积已入账比例 = 总实佣率/产品对应来佣率
         //计算累积已入账比例 = 总实佣率/产品对应来佣率
         BigDecimal totalRevenueRatio = paidRatio.divide(commissionRatio, 4, RoundingMode.HALF_UP);
         BigDecimal totalRevenueRatio = paidRatio.divide(commissionRatio, 4, RoundingMode.HALF_UP);
-        vo.setTotalRevenueRatio(totalRevenueRatio);
+        vo.setTotalRevenueRatio(totalRevenueRatio.multiply(BigDecimal.valueOf(100))
+                .setScale(2, RoundingMode.HALF_UP));
 
 
         // 待入账金额（已实现归零逻辑）
         // 待入账金额（已实现归零逻辑）
         if (commissionRatio != null && paidRatio.compareTo(commissionRatio) >= 0) {
         if (commissionRatio != null && paidRatio.compareTo(commissionRatio) >= 0) {