push

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

@@ -152,11 +152,6 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
      * @param commissionExpectedPage
      * @param commissionExpectedPage
      * @return
      * @return
      */
      */
-    /**
-     * 应收款管理列表查询（新版混合结果）
-     * @param commissionExpectedPage 预计来佣分页对象
-     * @return 混合主从记录的分页结果
-     */
     @Override
     @Override
     public Page<CommissionExpectedNewVO> getCommissionExpectedVONewPage(Page<CommissionExpected> commissionExpectedPage) {
     public Page<CommissionExpectedNewVO> getCommissionExpectedVONewPage(Page<CommissionExpected> commissionExpectedPage) {
         List<CommissionExpected> commissionExpectedList = commissionExpectedPage.getRecords();
         List<CommissionExpected> commissionExpectedList = commissionExpectedPage.getRecords();
@@ -229,10 +224,6 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
 
 
     /**
     /**
      * 构建主记录（预计来佣）
      * 构建主记录（预计来佣）
-     * 计算：实佣率(realRate) = 累积已入账比例(paidRatio)
-     *       达成率缺口(gapRate) = 1 - (实佣率 / 产品来佣率)
-     *       实收金额(realAmount) = 累积已入账金额(paidAmount)
-     *       本次入账比例(revenueRatio) 不适用，设为null
      */
      */
     private CommissionExpectedNewVO buildMainVo(CommissionExpected expected,
     private CommissionExpectedNewVO buildMainVo(CommissionExpected expected,
                                                 Map<String, Policy> policyMap,
                                                 Map<String, Policy> policyMap,
@@ -316,9 +307,6 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
 
 
     /**
     /**
      * 构建从记录（实际来佣）
      * 构建从记录（实际来佣）
-     * 计算：实佣率(realRate) = 本次实佣率(currentCommissionRatio)
-     *       本次入账比例(revenueRatio) = 本次实佣率 / 产品来佣率（若产品来佣率存在）
-     *       达成率缺口(gapRate) = 1 - (累积实佣率 / 产品来佣率)  // 累积实佣率从主记录获取
      */
      */
     private CommissionExpectedNewVO buildSubVo(Commission commission,
     private CommissionExpectedNewVO buildSubVo(Commission commission,
                                                Map<String, Policy> policyMap,
                                                Map<String, Policy> policyMap,