push

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

@@ -209,6 +209,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                 CommissionExpectedNewVO subVo = buildSubVo(commission, policyMap, policyFollowMap, mainVo);
                 CommissionExpectedNewVO subVo = buildSubVo(commission, policyMap, policyFollowMap, mainVo);
                 subVo.setNo(mainVo.getNo() + "-" + subIndex);
                 subVo.setNo(mainVo.getNo() + "-" + subIndex);
                 subVo.setType(2);
                 subVo.setType(2);
+                subVo.setGapRate(mainVo.getGapRate());
                 allMixedRecords.add(subVo);
                 allMixedRecords.add(subVo);
                 subIndex++;
                 subIndex++;
             }
             }
@@ -289,9 +290,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                     paidRatio.divide(commissionRatio, 4, RoundingMode.HALF_UP)
                     paidRatio.divide(commissionRatio, 4, RoundingMode.HALF_UP)
             );
             );
             // gap 可能为负，小于0时取0；然后转换为百分比数值（乘100，保留2位小数）
             // gap 可能为负，小于0时取0；然后转换为百分比数值（乘100，保留2位小数）
-            BigDecimal gapRate = gap.compareTo(BigDecimal.ZERO) < 0
-                    ? BigDecimal.ZERO
-                    : gap.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
+//            BigDecimal gapRate = gap.compareTo(BigDecimal.ZERO) < 0
+//                    ? BigDecimal.ZERO
+//                    : gap.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
+            BigDecimal gapRate = gap.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
             vo.setGapRate(gapRate);
             vo.setGapRate(gapRate);
 
 
             // 计算累积已入账比例 = 总实佣率/产品对应来佣率
             // 计算累积已入账比例 = 总实佣率/产品对应来佣率