业绩提成功能

hx-sale/src/main/java/com/fjhx/sale/service/commission/impl/CommissionServiceImpl.java

@@ -90,7 +90,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     private void saveOrUpdate(CommissionDto commissionDto){
         CommissionRule commissionRule = new CommissionRule();
         if (ObjectUtil.isNotEmpty(commissionDto.getCommissionRule())){
-           commissionRule = commissionDto.getCommissionRule();
+            commissionRule = commissionDto.getCommissionRule();
         }else {
             commissionRule.setAfterSalesRatio(new BigDecimal(4));
             commissionRule.setDepartmentalRatio(new BigDecimal(33));
@@ -101,19 +101,19 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
 
 
         //计算售后金额：到账金额 * 售后占比（保留两位小数向上取整）
-        commissionDto.setAfterSalesAmount(commissionDto.getContractArrival()
+        commissionDto.setAfterSalesAmount(commissionDto.getTotalIncome()
                 .multiply(commissionRule.getAfterSalesRatio())
                 .divide(new BigDecimal(100))
                 .setScale(2,BigDecimal.ROUND_HALF_UP));
 
         //计算公共金额：到账金额 * 公共占比
-        commissionDto.setPublicAmount(commissionDto.getContractArrival()
+        commissionDto.setPublicAmount(commissionDto.getTotalIncome()
                 .multiply(commissionRule.getPublicRatio())
                 .divide(new BigDecimal(100))
                 .setScale(2,BigDecimal.ROUND_HALF_UP));
 
         //计算总办金额：到账金额 * 总办占比
-        commissionDto.setHaveOverallAmount(commissionDto.getContractArrival()
+        commissionDto.setHaveOverallAmount(commissionDto.getTotalIncome()
                 .multiply(commissionRule.getHaveOverallRatio())
                 .divide(new BigDecimal(100))
                 .setScale(2,BigDecimal.ROUND_HALF_UP));